Merge branch 'master' into CoolDeathAnimation

# Conflicts: # include/Engine/Rendering/ModelJob.h # resources/Shaders/ForwardPlus.frag.glsl # src/Engine/Rendering/DrawFinalPass.cpp # src/Engine/Rendering/RenderSystem.cpp
2016-01-27 10:31:28 +01:00
parent 44baa47bba 505a6c7396
commit 7e12d00874
44 changed files with 838 additions and 138 deletions
@@ -33,6 +33,7 @@
 							<xs:element ref="c:DirectionalLight" minOccurs="0"/>
 							<xs:element ref="c:UniformScale" minOccurs="0"/>
 							<xs:element ref="c:EditorWidget" minOccurs="0"/>
+							<xs:element ref="c:Lifetime" minOccurs="0"/>
 						</xs:all>
 					</xs:complexType>
 				</xs:element>