sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge fails

Browse Source
This commit is contained in:
Lynix
2016-10-12 17:29:08 +02:00
parent 561c0cf51f
commit 4ba744c1bc
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SDK/src/NDK/Systems/RenderSystem.cpp
View File

@@ -216,13 +216,6 @@ namespace Ndk
m_forceRenderQueueInvalidation = false; m_forceRenderQueueInvalidation = false;
} }
for (const Ndk::EntityHandle& particleGroup : m_particleGroups)
{
ParticleGroupComponent& groupComponent = particleGroup->GetComponent<ParticleGroupComponent>();
groupComponent.AddToRenderQueue(renderQueue, Nz::Matrix4f::Identity()); //< ParticleGroup doesn't use Matrix4f
}
camComponent.ApplyView(); camComponent.ApplyView();
Nz::SceneData sceneData; Nz::SceneData sceneData;

1
src/Nazara/Graphics/ForwardRenderTechnique.cpp
View File

@@ -771,7 +771,6 @@ namespace Nz
} }
} }
} }
instances.clear();
} }
} }
} }