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

Merge remote-tracking branch 'origin/master' into Networking

Browse Source
This commit is contained in:
Jocke
2016-01-12 13:17:00 +01:00
parent 236230d12c 84818f6fcb
commit 2bf1d53f2c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/Empty.xml
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<Entity xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd" xmlns:c="components">
<Components>
<c:Transform/>
</Components>
</Entity>
src/Engine/Editor/EditorSystem.cpp
+2 -2
View File
@@ -615,8 +615,8 @@ bool EditorSystem::createEntityNode(World* world, EntityID entity)
if (ImGui::BeginPopupContextItem("item context menu")) { if (ImGui::BeginPopupContextItem("item context menu")) {
if (ImGui::Button("Add")) { if (ImGui::Button("Add")) {
EntityID entity = world->CreateEntity(entity); EntityID newEntity = world->CreateEntity(entity);
world->AttachComponent(entity, "Transform"); world->AttachComponent(newEntity, "Transform");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Delete")) { if (ImGui::Button("Delete")) {