Merge pull request #715 from Areloch/ConvexShapeSpawnFix

Fixes creation of convex shapes via editor

Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript

@@ -51,6 +51,8 @@ function ConvexEditorGui::onSleep( %this )
 function ConvexEditorGui::createConvexBox( %this )
 {
    %obj = genericCreateObject( "ConvexShape" );
+   %obj.setMaterial(%this.materialName); //set whatever the editor has as it's default material to the new one
+   
    %this.handleDeselect();
    %this.selectConvex( %obj );
    %this.dropSelectionAtScreenCenter();

Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript

@@ -227,6 +227,10 @@ function ObjectCreator::createObject( %this, %cmd )
       %this.setNewObjectGroup( getScene(0) );
 
    pushInstantGroup();
+   
+   if(startsWith(%cmd, "return "))
+      %objId = eval(%cmd);
+   else
    %objId = eval("return " @ %cmd);
    popInstantGroup();