BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Uncommented code.

Browse Source
This commit is contained in:
William Moberg
2016-03-02 17:06:53 +01:00
parent 4ef76f6c45
commit 53c520123a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Editor/EditorSystem.cpp
+3 -3
View File
@@ -258,17 +258,17 @@ EntityWrapper EditorSystem::importEntity(EntityWrapper parent, boost::filesystem
return EntityWrapper::Invalid; return EntityWrapper::Invalid;
} }
//try { try {
auto entityFile = ResourceManager::Load<EntityFile>(filePath.string()); auto entityFile = ResourceManager::Load<EntityFile>(filePath.string());
EntityFilePreprocessor fpp(entityFile); EntityFilePreprocessor fpp(entityFile);
fpp.RegisterComponents(parent.World); fpp.RegisterComponents(parent.World);
EntityFileParser fp(entityFile); EntityFileParser fp(entityFile);
EntityID newEntity = fp.MergeEntities(parent.World, parent.ID); EntityID newEntity = fp.MergeEntities(parent.World, parent.ID);
return EntityWrapper(parent.World, newEntity); return EntityWrapper(parent.World, newEntity);
/*} catch (const std::exception& e) { } catch (const std::exception& e) {
LOG_ERROR("Failed to import entity \"%s\": \"%s\"", filePath.string().c_str(), e.what()); LOG_ERROR("Failed to import entity \"%s\": \"%s\"", filePath.string().c_str(), e.what());
return EntityWrapper::Invalid; return EntityWrapper::Invalid;
}*/ }
} }
void EditorSystem::setWidgetMode(EditorGUI::WidgetMode mode) void EditorSystem::setWidgetMode(EditorGUI::WidgetMode mode)