Fix merge fails

2016-10-12 17:29:08 +02:00
parent 561c0cf51f
commit 4ba744c1bc
2 changed files with 0 additions and 8 deletions
--- a/src/Nazara/Graphics/ForwardRenderTechnique.cpp
+++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
@@ -771,7 +771,6 @@ namespace Nz
 										}
 									}
 								}
-								instances.clear();
 							}
 						}
 					}