From 4ba744c1bc510f10f533a2cc1f91cb1cdabda229 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Wed, 12 Oct 2016 17:29:08 +0200
Subject: [PATCH] Fix merge fails

---
 SDK/src/NDK/Systems/RenderSystem.cpp           | 7 -------
 src/Nazara/Graphics/ForwardRenderTechnique.cpp | 1 -
 2 files changed, 8 deletions(-)

diff --git a/SDK/src/NDK/Systems/RenderSystem.cpp b/SDK/src/NDK/Systems/RenderSystem.cpp
index 3a7eb14da..806a45e8c 100644
--- a/SDK/src/NDK/Systems/RenderSystem.cpp
+++ b/SDK/src/NDK/Systems/RenderSystem.cpp
@@ -216,13 +216,6 @@ namespace Ndk
 				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();
 
 			Nz::SceneData sceneData;
diff --git a/src/Nazara/Graphics/ForwardRenderTechnique.cpp b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
index 7472a65c6..3363d22b7 100644
--- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp
+++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
@@ -771,7 +771,6 @@ namespace Nz
 										}
 									}
 								}
-								instances.clear();
 							}
 						}
 					}