Browse Source

Merge branch 'master' of https://github.com/AtomicGameEngine/AtomicGameEngine into RED-ATOMIC-HAXE

rsredsq 10 years ago
parent
commit
86d9424cef
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Source/AtomicEditor/Editors/SceneEditor3D/SceneView3D.cpp

+ 2 - 1
Source/AtomicEditor/Editors/SceneEditor3D/SceneView3D.cpp

@@ -498,7 +498,7 @@ void SceneView3D::HandleDragEnterWidget(StringHash eventType, VariantMap& eventD
         }
         else if (importerType == ModelImporter::GetTypeNameStatic())
         {
-            dragNode_ = scene_->CreateChild(asset->GetName());
+            dragNode_ = scene_->CreateChild();
 
             SharedPtr<File> file(new File(context_, asset->GetCachePath()));
             SharedPtr<XMLFile> xml(new XMLFile(context_));
@@ -507,6 +507,7 @@ void SceneView3D::HandleDragEnterWidget(StringHash eventType, VariantMap& eventD
                 return;
 
             dragNode_->LoadXML(xml->GetRoot());
+            dragNode_->SetName(asset->GetName());
         }
         else if (importerType == SpriterImporter::GetTypeNameStatic())
         {