Upgrade popcorn fx library from 3.17->3.18

Signed-off-by: AMZN-Gene <[email protected]>

PopcornFX/Editor/AnimationTracks/Circle.pkcf

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 COvenBakeConfig_Mesh	$82362157
 {
 	ImportGeometry = false;

PopcornFX/Editor/AnimationTracks/PingPong.pkcf

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 COvenBakeConfig_Mesh	$A6D04D13
 {
 	ImportGeometry = false;

PopcornFX/Editor/Presets/Effects/Basic.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a776df3b9ae9177628f789de84cbcb8975cb854bc4c34ea80df8cdfcd8da986
+oid sha256:1eb68d4a04eea0e2d23eee019c9cbdc977f2c62988782bf401918ca7399dfeae
 size 29690

PopcornFX/Editor/Presets/Effects/FX_Simple.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:781d7e0b089a45500d9b5686759b06825a9dcaa4abb1f967d5eeaf6d3c25b094
+oid sha256:ea2c0a0a6a9464f41dd53b26ffcacc464668d6150c06272ec69b513229173819
 size 31013

PopcornFX/Library/PopcornFXCore/Materials/Animated_Mesh.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Billboard.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Decal.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Light.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Mesh.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Ribbon.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Sound.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Default_Triangle.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Distortion_Billboard.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Distortion_Ribbon.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Billboard/Billboard_Diffuse.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Billboard/Billboard_Distortion.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Billboard/Billboard_Emissive.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Billboard/Billboard_Opaque.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Billboard/Billboard_Tinted.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Decal/Decal_Diffuse.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Decal/Decal_Emissive.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Light/Light_Default.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Mesh/Mesh_Emissive.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Mesh/Mesh_Opaque.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Mesh/Mesh_Tinted.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_CorrectDeformation_Diffuse.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_CorrectDeformation_Distortion.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_CorrectDeformation_Emissive.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_CorrectDeformation_Opaque.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_CorrectDeformation_Tinted.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_Diffuse.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_Distortion.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_Emissive.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_Opaque.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Ribbon/Ribbon_Tinted.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Sound/Sound_Default.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Triangle/Triangle_Diffuse.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Triangle/Triangle_Distortion.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Triangle/Triangle_Emissive.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Triangle/Triangle_Opaque.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Experimental/Triangle/Triangle_Tinted.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Interface/Editor.pkri

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CEngineRendererInterface	$6B70D015
 {
 	InterfaceName = "Editor features";
@@ -265,6 +265,8 @@ CParticleRendererFeature	$B660FBF9
 		"$ECEE2C92",
 		"$C71A50C8",
 		"$4703F6C7",
+		"$44ED3089",
+		"$2464CFDC",
 		"$6B1D589C",
 	};
 }
@@ -363,6 +365,8 @@ CParticleNodeTemplateExport	$6B1D589C
 		"ViewposAligned",
 		"NormalAxisAligned",
 		"SideAxisAligned",
+		"SideAxisAlignedTube",
+		"SideAxisAlignedMultiPlane",
 	};
 }
 CParticleNodePinIn	$6B1D589F
@@ -5075,3 +5079,77 @@ CParticleNodePinOut	$C3ECE4FE
 	SelfName = "Value";
 	Owner = "$25BA4FE3";
 }
+CParticleNodeTemplateExport	$2464CFDC
+{
+	InputPins = {
+		"$ACE27859",
+	};
+	OutputPins = {
+		"$6C201C5D",
+	};
+	ExportedName = "General.SegmentCount";
+	ExportedType = int;
+	Type = Input;
+	InputType = Property;
+	CategoryName = {
+		"@eng:General",
+	};
+	HasMin = true;
+	HasMax = true;
+	UseSlider = true;
+	DefaultValueI4 = int4(8, 0, 0, 0);
+	MinValueI4 = int4(3, 0, 0, 0);
+	MaxValueI4 = int4(16, 0, 0, 0);
+	PinRules = Rule1;
+	BaseVisibility = Hidden;
+	RuleResult = Visible;
+	DependentProperty = "General.BillboardingMode";
+	RuleValue = "3";
+}
+CParticleNodePinIn	$ACE27859
+{
+	SelfName = "DefaultValue";
+	Owner = "$2464CFDC";
+}
+CParticleNodePinOut	$6C201C5D
+{
+	SelfName = "Value";
+	Owner = "$2464CFDC";
+}
+CParticleNodeTemplateExport	$44ED3089
+{
+	InputPins = {
+		"$880D83C6",
+	};
+	OutputPins = {
+		"$C7C72EFA",
+	};
+	ExportedName = "General.PlaneCount";
+	ExportedType = int;
+	Type = Input;
+	InputType = Property;
+	CategoryName = {
+		"@eng:General",
+	};
+	HasMin = true;
+	HasMax = true;
+	UseSlider = true;
+	DefaultValueI4 = int4(2, 0, 0, 0);
+	MinValueI4 = int4(2, 0, 0, 0);
+	MaxValueI4 = int4(8, 0, 0, 0);
+	PinRules = Rule1;
+	BaseVisibility = Hidden;
+	RuleResult = Visible;
+	DependentProperty = "General.BillboardingMode";
+	RuleValue = "4";
+}
+CParticleNodePinIn	$880D83C6
+{
+	SelfName = "DefaultValue";
+	Owner = "$44ED3089";
+}
+CParticleNodePinOut	$C7C72EFA
+{
+	SelfName = "Value";
+	Owner = "$44ED3089";
+}

PopcornFX/Library/PopcornFXCore/Materials/Interface/Experimental.pkri

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CEngineRendererInterface	$6B70D015
 {
 	InterfaceName = "Experimental material features";
@@ -256,6 +256,8 @@ CParticleRendererFeature	$B660FBF9
 		"$ECEE2C92",
 		"$C71A50C8",
 		"$4703F6C7",
+		"$1CD109AB",
+		"$FA60E0CE",
 		"$6B1D589C",
 	};
 }
@@ -354,6 +356,8 @@ CParticleNodeTemplateExport	$6B1D589C
 		"ViewposAligned",
 		"NormalAxisAligned",
 		"SideAxisAligned",
+		"SideAxisAlignedTube",
+		"SideAxisAlignedMultiPlane",
 	};
 }
 CParticleNodePinIn	$6B1D589F
@@ -1688,6 +1692,7 @@ CParticleNodeTemplateExport	$88F8E019
 	CategoryName = {
 		"@eng:BasicTransformUVs",
 	};
+	PinRules = Rule1;
 }
 CParticleNodePinIn	$88F8E01F
 {
@@ -3104,6 +3109,9 @@ CParticleNodeTemplateExport	$DEF82E86
 	UseSlider = true;
 	DefaultValueF4 = float4(5.0000000e-01, 0.0000000e+00, 0.0000000e+00, 0.0000000e+00);
 	MaxValueF4 = float4(1.0000000e+00, 0.0000000e+00, 0.0000000e+00, 0.0000000e+00);
+	PinRules = Rule1;
+	DependentProperty = "General.BillboardingMode";
+	RuleValue = "3";
 }
 CParticleNodePinIn	$AE218CC1
 {
@@ -4427,3 +4435,77 @@ CParticleNodePinOut	$0AEAA135
 	SelfName = "Value";
 	Owner = "$BB3DED95";
 }
+CParticleNodeTemplateExport	$1CD109AB
+{
+	InputPins = {
+		"$BD23BFC1",
+	};
+	OutputPins = {
+		"$B6664671",
+	};
+	ExportedName = "General.PlaneCount";
+	ExportedType = int;
+	Type = Input;
+	InputType = Property;
+	CategoryName = {
+		"@eng:General",
+	};
+	HasMin = true;
+	HasMax = true;
+	UseSlider = true;
+	DefaultValueI4 = int4(2, 0, 0, 0);
+	MinValueI4 = int4(2, 0, 0, 0);
+	MaxValueI4 = int4(8, 0, 0, 0);
+	PinRules = Rule1;
+	BaseVisibility = Hidden;
+	RuleResult = Visible;
+	DependentProperty = "General.BillboardingMode";
+	RuleValue = "4";
+}
+CParticleNodePinIn	$BD23BFC1
+{
+	SelfName = "DefaultValue";
+	Owner = "$1CD109AB";
+}
+CParticleNodePinOut	$B6664671
+{
+	SelfName = "Value";
+	Owner = "$1CD109AB";
+}
+CParticleNodeTemplateExport	$FA60E0CE
+{
+	InputPins = {
+		"$0B7EBFDE",
+	};
+	OutputPins = {
+		"$2D0B75A0",
+	};
+	ExportedName = "General.SegmentCount";
+	ExportedType = int;
+	Type = Input;
+	InputType = Property;
+	CategoryName = {
+		"@eng:General",
+	};
+	HasMin = true;
+	HasMax = true;
+	UseSlider = true;
+	DefaultValueI4 = int4(8, 0, 0, 0);
+	MinValueI4 = int4(3, 0, 0, 0);
+	MaxValueI4 = int4(16, 0, 0, 0);
+	PinRules = Rule1;
+	BaseVisibility = Hidden;
+	RuleResult = Visible;
+	DependentProperty = "General.BillboardingMode";
+	RuleValue = "3";
+}
+CParticleNodePinIn	$0B7EBFDE
+{
+	SelfName = "DefaultValue";
+	Owner = "$FA60E0CE";
+}
+CParticleNodePinOut	$2D0B75A0
+{
+	SelfName = "Value";
+	Owner = "$FA60E0CE";
+}

PopcornFX/Library/PopcornFXCore/Materials/Interface/MeshAnim.pkri

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CEngineRendererInterface	$6B70D015
 {
 	InterfaceName = "Mesh Anim";

PopcornFX/Library/PopcornFXCore/Materials/Interface/SkeletalAnimationTexture.pkri

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CEngineRendererInterface	$6B70D015
 {
 	InterfaceName = "Skeletal Animation Texture";

PopcornFX/Library/PopcornFXCore/Materials/Opaque_Billboard.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Opaque_Ribbon.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Opaque_Triangle.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Materials/Transparent_Mesh.pkma

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 CParticleRendererMaterial	$6B70D015
 {
 	RendererFeatures = {

PopcornFX/Library/PopcornFXCore/Shaders/Default_Ribbon.frag

@@ -185,7 +185,10 @@ void    FragmentMain(IN(SFragmentInput) fInput, OUT(SFragmentOutput) fOutput FS_
 	vec2	UVOffset = fInput.fragTransformUVs_UVOffset;
 	vec4	rect0 = vec4(1.0f, 1.0f, 0.0f, 0.0f);
 #	if	defined(HAS_Atlas)
-	rect0 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID)) * 4 + 1));
+	if (blendingType >= 1)
+	{
+		rect0 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID)) * 4 + 1));
+	}
 	vec4	rect1 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID) + 1) * 4 + 1));
 
 	vec2	oldFragUV1 = fragUV1;

PopcornFX/Library/PopcornFXCore/Shaders/Opaque_Ribbon.frag

@@ -87,7 +87,10 @@ void     FragmentMain(IN(SFragmentInput) fInput, OUT(SFragmentOutput) fOutput FS
 	vec2	UVOffset = fInput.fragTransformUVs_UVOffset;
 	vec4	rect0 = vec4(1.0f, 1.0f, 0.0f, 0.0f);
 #	if	defined(HAS_Atlas)
-	rect0 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID)) * 4 + 1));
+	if (blendingType >= 1)
+	{
+		rect0 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID)) * 4 + 1));
+	}
 	vec4	rect1 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID) + 1) * 4 + 1));
 
 	vec2	oldFragUV1 = fragUV1;

PopcornFX/Library/PopcornFXCore/Shaders/Particle_Master.frag

@@ -189,7 +189,10 @@ void    FragmentMain(IN(SFragmentInput) fInput, OUT(SFragmentOutput) fOutput FS_
 	vec2	UVOffset = fInput.fragTransformUVs_UVOffset;
 	vec4	rect0 = vec4(1.0f, 1.0f, 0.0f, 0.0f);
 #	if	defined(HAS_Atlas)
-	rect0 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID)) * 4 + 1));
+	if (blendingType >= 1)
+	{
+		rect0 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID)) * 4 + 1));
+	}
 	vec4	rect1 = LOADF4(GET_RAW_BUFFER(Atlas), RAW_BUFFER_INDEX(min(LOADU(GET_RAW_BUFFER(Atlas), 0) - 1, uint(fInput.fragAtlas_TextureID) + 1) * 4 + 1));
 
 	vec2	oldFragUV1 = fragUV1;

PopcornFX/Library/PopcornFXCore/Templates/Color.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55137bf77c0f46048469fe16a13c15d91bbb9d4b1d3a824dd3dccee7a20673b8
-size 118002
+oid sha256:bd93b2525530cc4f922cc410d2383b0f60352b57c42b24365947c587f68f2720
+size 117248

PopcornFX/Library/PopcornFXCore/Templates/Core.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb7b872cf56696e0c48581b9cfd436ec238bc2b349d090d843af752b4f8db4ac
-size 490347
+oid sha256:1be33df434eba8c6047aec00b724c063ee048e69626d4c42f5362208751f4f0e
+size 656869

PopcornFX/Library/PopcornFXCore/Templates/CurvePresets.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47ab603dd5d170e8fbd61a029053c8f33211b58bf8dfd50b204c370ca1bfaad9
-size 20838
+oid sha256:d861ac9ac3510b5c4b85d82010182cb3c400f4a25fe236c73048bc8a2c31ccf6
+size 20815

PopcornFX/Library/PopcornFXCore/Templates/Debug.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83a04f3547dcc3a12f744b51b7b77d9f5c0c5847e6fe812cca5b22e13259344a
-size 129554
+oid sha256:aaf34e886380ada65021818ff9123266c93eec7291141f49583a937a3ce502ad
+size 129277

PopcornFX/Library/PopcornFXCore/Templates/Dynamics.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a883783e77f05aa8e38882165c4825e445350d9a403a9ff2d5431bb74b4e1dc4
-size 717195
+oid sha256:638169220a74f3d6cf661603f99ede798c47267bac1a7ec6e4193ae01a8210ae
+size 717437

PopcornFX/Library/PopcornFXCore/Templates/Events.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf6ff892802c6c1ffe15553dcd9a8b7ce0d76be184234050b931a2dd45f25d7e
-size 396467
+oid sha256:66507a1671051b8e214feef3cb5a1bc411f63c06fddd78fbd262edd51194f1fd
+size 382003

PopcornFX/Library/PopcornFXCore/Templates/Legacy.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76c1662fe8bd1782654e6007f4633fe173be3fbae38c92e7b28b206be786a387
-size 798495
+oid sha256:4d22f11c332e75280b2939934924a496b78a7d3a0167a12281b004f09448313f
+size 795328

PopcornFX/Library/PopcornFXCore/Templates/Placement.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:170ff66aeadf582d0bdf108eb664cfa5ad7bfabddc298bb7e5c12131ae99ef94
-size 197480
+oid sha256:f52fe95b8f613bb8e58c8eff18e7c508c39e534a7ad21bdee6cf73064580c497
+size 195955

PopcornFX/Library/PopcornFXCore/Templates/Samplers.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6fe549673a507ea6f278d2ed5c948fbe9325c66c4f00b48323c743ad55eaf81a
-size 347098
+oid sha256:377132b875efa030f0662b6887a929f886ea35865df6af6a67501d5ae0cd7c02
+size 348531

PopcornFX/Library/PopcornFXCore/Templates/Trails.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1744a54ad2fd93eaf0a937c14ee45d911233a45a5d234f9fd023b88124034664
-size 114205
+oid sha256:367303ec06ead73155f8297655a1db511237817608f1bd970cbdb367e4452faf
+size 113547

PopcornFX/Library/PopcornFXCore/Templates/Utils.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e89f28d9fee47006c8dda93790bdff14db5618f83104f3aecad28e3bd2a4a16
-size 476329
+oid sha256:406486d3fbedaa41f57c5286f25bbe86d43b8148f77265b5e5beb3560d7cfa20
+size 474306

PopcornFX/Library/SpaceSoldiers_Gun_Impact.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9990afd1521551133e4f965d27311d2dac53b5d0cf9e3e021c8f8005446cbcc5
+oid sha256:5a7d87f393bf7e48b4604842326928702b71459c94d0a3111b3e294845693389
 size 128916

PopcornFX/Library/Straight_Shot_Effect.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59dade6d88af0c81c007e16bd8f8150bd45d813c36991ee91809fc9433a0c3cf
+oid sha256:699729e5b01a1021c1f4d3436f72cb0bff206c818244df886cf08e57265a157c
 size 180603

PopcornFX/Library/Test_Simple.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3caa4e487f9f091c7e877733ac573f2474ab35f771055832d93775be48d0a150
+oid sha256:40e3c1d13916a7ef877f748c3b2f53f2be7980cc15b25d6d77be28f39dfa4c23
 size 30102

PopcornFX/Meshes/Anim/Circle.pkcf

@@ -1,4 +1,4 @@
-Version = 2.17.0.17676;
+Version = 2.18.0.18760;
 COvenBakeConfig_Mesh	$82362157
 {
 	ImportGeometry = false;

PopcornFX/Particles/BubbleGun/FX_BubbleGun_Blast.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:444605b05e43d008a97c1c789af0659ae4d484b82f0fadcb1b7b377903af08b0
+oid sha256:5253ff1bb44b91ff87543c3511ea72e55487cc3a5fefafada9fbaee3cd98b079
 size 472147

PopcornFX/Particles/BubbleGun/FX_BubbleGun_Explosion.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f5e7787e4e88cd5a272bf488dc80f3244da2a86f9ed8ac7a08dcf81c9042bc9b
+oid sha256:6751b0c6bcd2d0139d043362e94deebdd9336fc3e77d4acf243ac240dc7a0934
 size 439022

PopcornFX/Particles/BubbleGun/FX_BubbleGun_Projectile.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad7766f7bbf9f45e5b94c22142c8f185c8502761bd06b31ac983312847d2e720
+oid sha256:450d0682291aa4f84ed4f0684f197b7316d5acd590f3d68f159db2b3f23f6e68
 size 548939

PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Blast.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8683be60ed98ed066394edf2bb3500f3d196974594069f9b04abbae6be6ef6f9
+oid sha256:8f50235f86164d9cf18c0ca170e49950c3e54cdc66aa9b45d4d32fdc872770d5
 size 138857

PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Explosion.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44ce807b198778cea4d1b1c3b6075e4a11649634d051bce831625030781506e3
+oid sha256:dd3af94bb4105b5f43fe0ed4a07f4e466a7dfcede43b64e0466239b719cbd4f5
 size 206081

PopcornFX/Particles/DefenseTurret/FX_DefenseTurret_Projectile.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1580c30dea8f6d0074ba95aac2b9575902c861e4bbb2dc7b4ff9c47718ca9aca
+oid sha256:20a342432533c38ae2f2beeec26b07f03d45c6de4e7589b3625d7b77271a68af
 size 159140

PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_BuildUp.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fb23aa2e453216c07bcc43a99aabb748feaf46a8186877dd7593c9c606a71e1
+oid sha256:12bedc098e35068f0cb4ae0f4d5014f5d5a1e919baec2efedb197cda390040a3
 size 270326

PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_Explosion.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:15b5df75578930db3d01cf4d815f804397d21b269a4c41b39d0b6740022cccaa
+oid sha256:c0d7e65f6e9bb0c97a4ff97c2b3ae363a3f0d5ab110aa6b6d17618a8ad85f7f5
 size 650480

PopcornFX/Particles/EnergyBallTrap/FX_EnergyBallTrap_Projectile.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f49a70c63ca5e42bc8ba3a50f96721880c05975f98cb74912db4f844af36a1e6
+oid sha256:50215a77d6960b2ec3df38b987db639dd8757369ebb8bfd0ff5f755f81d68fb6
 size 404809

PopcornFX/Particles/FX_JumpPad.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:280123ece709a1b02807cfff14bb6f7c06ac72821cc9e7dcfac60df5cb2faba9
+oid sha256:d19e79a5a8480616828513ff226d20cf53bab642a286b948cd9ecbd1cd9c5bde
 size 395012

PopcornFX/Particles/LaserPistol/FX_LaserPistol.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20baaff55ebd7297f295233cbe517e22dac6f1fd6486f60a8170658c1a6e9f11
+oid sha256:ae46819837532149d53fb2ba80e432c933578276649e07bb4887e7fa1b8187ac
 size 796522

PopcornFX/Particles/LaserPistol/FX_LaserPistol_Blast.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:86244bdcfbfa38d8df5f19f6c49847abfb31d36c3e137d20c7f098037bc5d4f7
+oid sha256:6ddb30e81c37c3a2c27bc983717cd1436323e4b6b40cd3d5713bd4dd2c22712a
 size 360968

PopcornFX/Particles/LaserPistol/FX_LaserPistol_Display.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c5f18ef752cdc2d03c3a105e61ca3ea40af1210b0c635c1b1e52605057349f6
+oid sha256:e25beac3377a9686060d015e8f7bee80b732a989bc117c05775e38d1d223720a
 size 796522

PopcornFX/Particles/LaserPistol/FX_LaserPistol_Explosion.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98bff094130a9aba61f0bb5ebcacb2e71d1fcbb892563ab4aa73e5473377c21e
+oid sha256:f13279ba659007e5f7b0194f83dd39418f1e0e8666cbcca5ac583e809479275e
 size 398423

PopcornFX/Particles/LaserPistol/FX_LaserPistol_Ray.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc430cee9d77358d26896dfa699aa4cf32d47b21a6d00db1200ee934c4eda445
+oid sha256:60184cb4060ebac2e4cd98d9ab545e4ebab065e05980bdbfc8a35a8f4d372d14
 size 491044

PopcornFX/Particles/MalfunctionningShieldGenerator/FX_EnergyCollector.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25e4f57e53e8d344feed07149929384911d41456c3a9db835e42f34343585b3c
+oid sha256:f7f60f6a2e43f8d5ad78a4fccde4d30e6a4315e7097d3eb379fd828561aab582
 size 830946

PopcornFX/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_BuildUp.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9222f76c5e4fd647db8044c3799c00e4493dc7db9dd436557ac77cf97080bdff
+oid sha256:f196ad3ea448a9d0f3847a1b06ee5ae2324562dd3ac396e017c7f467da45665d
 size 606033

PopcornFX/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_Explosion.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b64d955f1aa7d9a341bda5a1ca36f085f928e96f9926f31aa7add1be1031442
+oid sha256:72792cbcb2fec65e44911f6749deacd6959e5067216154481d79065b608d788c
 size 1021940

PopcornFX/Particles/MalfunctionningShieldGenerator/FX_MalfunctionningShieldGenerator_Idle.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:35bd3912922c46f75746461baed5081dd96a02c404e4514afa72416db81a5ff3
+oid sha256:8af4e40375d7de6f62c1a121420c8a706282f8f33e3ddc9bec23cd797f6095fa
 size 642610

PopcornFX/Particles/VFX_SpeedPowerUp.pkfx

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8e93ab398cd1eca9d763e490d25d4c2a790190c81dc0d5c527d6d24ad30a5483
+oid sha256:03f85a1a1fffd773f14d8471c15f0d0e2e3c891d4fbfcadcb8c85885f82f7e81
 size 448255

PopcornFX/PopcornProject.pkproj

@@ -1,4 +1,4 @@
-Version = 2.17.3.18088;
+Version = 2.18.1.18964;
 CProjectSettings	$D857A09F
 {
 	General = "$35A36C4E";