Bläddra i källkod

Merge branch 'master' of https://github.com/HeapsIO/hide

Tom SPIRA 6 år sedan
förälder
incheckning
175bb93ca8
2 ändrade filer med 14 tillägg och 0 borttagningar
  1. 12 0
      hide/comp/SceneEditor.hx
  2. 2 0
      hide/view/l3d/Level3D.hx

+ 12 - 0
hide/comp/SceneEditor.hx

@@ -556,6 +556,9 @@ class SceneEditor {
 				var parentEl = curEdit.rootElements[0];
 				if(parentEl == null)
 					parentEl = elt;
+				var group = getParentGroup(parentEl);
+				if(group != null)
+					parentEl = group;
 				var newItems = getNewContextMenu(parentEl, function(newElt) {
 					var newObj3d = Std.instance(newElt, Object3D);
 					if(newObj3d != null) {
@@ -1916,4 +1919,13 @@ class SceneEditor {
 		}
 		return false;
 	}
+
+	static function getParentGroup(elt: PrefabElement) {
+		while(elt != null) {
+			if(elt.type == "object")
+				return elt;
+			elt = elt.parent;
+		}
+		return null;
+	}
 }

+ 2 - 0
hide/view/l3d/Level3D.hx

@@ -194,6 +194,8 @@ private class Level3DSceneEditor extends hide.comp.SceneEditor {
 					Reflect.setField(p.props, "$cdbtype", typeId);
 					p.name = name;
 					setup(p);
+					if(onMake != null)
+						onMake(p);
 					return p;
 				}