[Bf-blender-cvs] [8d4deba277d] temp-greasepencil-vfx: Add missing copyData function

[Antonio Vazquez]

Commit: 8d4deba277dfd0b6eba5d0f5b9e68e0a3f5cd2cd
Author: Antonio Vazquez
Date:   Wed Jun 27 11:00:14 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rB8d4deba277dfd0b6eba5d0f5b9e68e0a3f5cd2cd

Add missing copyData function

This function was removed by error when migrate the old VFX, but it's required by depsgraph to do the COW.

===================================================================

M	source/blender/shader_fx/intern/FX_shader_blur.c
M	source/blender/shader_fx/intern/FX_shader_flip.c
M	source/blender/shader_fx/intern/FX_shader_light.c
M	source/blender/shader_fx/intern/FX_shader_pixel.c
M	source/blender/shader_fx/intern/FX_shader_swirl.c
M	source/blender/shader_fx/intern/FX_shader_wave.c

===================================================================

diff --git a/source/blender/shader_fx/intern/FX_shader_blur.c b/source/blender/shader_fx/intern/FX_shader_blur.c
index 6537bd18740..7df9679b045 100644
--- a/source/blender/shader_fx/intern/FX_shader_blur.c
+++ b/source/blender/shader_fx/intern/FX_shader_blur.c
@@ -42,6 +42,11 @@ static void initData(ShaderFxData *fx)
 	gpfx->coc = 0.025f;
 }
 
+static void copyData(const ShaderFxData *md, ShaderFxData *target)
+{
+	BKE_shaderfx_copyData_generic(md, target);
+}
+
 ShaderFxTypeInfo shaderfx_Type_Blur = {
 	/* name */              "Gaussian Blur",
 	/* structName */        "BlurShaderFxData",
@@ -49,7 +54,7 @@ ShaderFxTypeInfo shaderfx_Type_Blur = {
 	/* type */              eShaderFxType_GpencilType,
 	/* flags */             eShaderFxTypeFlag_Single,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 
 	/* initData */          initData,
 	/* freeData */          NULL,
diff --git a/source/blender/shader_fx/intern/FX_shader_flip.c b/source/blender/shader_fx/intern/FX_shader_flip.c
index 6c16c10a784..404e2f8160e 100644
--- a/source/blender/shader_fx/intern/FX_shader_flip.c
+++ b/source/blender/shader_fx/intern/FX_shader_flip.c
@@ -45,6 +45,11 @@ static void initData(ShaderFxData *fx)
 	gpfx->flag |= FX_FLIP_HORIZONTAL;
 }
 
+static void copyData(const ShaderFxData *md, ShaderFxData *target)
+{
+	BKE_shaderfx_copyData_generic(md, target);
+}
+
 ShaderFxTypeInfo  shaderfx_Type_Flip = {
 	/* name */              "Flip",
 	/* structName */        "FlipShaderFxData",
@@ -52,7 +57,7 @@ ShaderFxTypeInfo  shaderfx_Type_Flip = {
 	/* type */              eShaderFxType_GpencilType,
 	/* flags */             eShaderFxTypeFlag_Single,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 
 	/* initData */          initData,
 	/* freeData */          NULL,
diff --git a/source/blender/shader_fx/intern/FX_shader_light.c b/source/blender/shader_fx/intern/FX_shader_light.c
index ef61d37a469..c4bc0161bce 100644
--- a/source/blender/shader_fx/intern/FX_shader_light.c
+++ b/source/blender/shader_fx/intern/FX_shader_light.c
@@ -54,6 +54,11 @@ static void initData(ShaderFxData *fx)
 	gpfx->object = NULL;
 }
 
+static void copyData(const ShaderFxData *md, ShaderFxData *target)
+{
+	BKE_shaderfx_copyData_generic(md, target);
+}
+
 static void updateDepsgraph(ShaderFxData *md, const ModifierUpdateDepsgraphContext *ctx)
 {
 	LightShaderFxData *fxd = (LightShaderFxData *)md;
@@ -87,7 +92,7 @@ ShaderFxTypeInfo shaderfx_Type_Light = {
 	/* type */              eShaderFxType_GpencilType,
 	/* flags */             eShaderFxTypeFlag_Single,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 
 	/* initData */          initData,
 	/* freeData */          NULL,
diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.c b/source/blender/shader_fx/intern/FX_shader_pixel.c
index c0543b9dee9..a3ffd3a9b0d 100644
--- a/source/blender/shader_fx/intern/FX_shader_pixel.c
+++ b/source/blender/shader_fx/intern/FX_shader_pixel.c
@@ -42,6 +42,11 @@ static void initData(ShaderFxData *fx)
 	gpfx->flag |= FX_PIXEL_USE_LINES;
 }
 
+static void copyData(const ShaderFxData *md, ShaderFxData *target)
+{
+	BKE_shaderfx_copyData_generic(md, target);
+}
+
 ShaderFxTypeInfo shaderfx_Type_Pixel = {
 	/* name */              "Pixelate",
 	/* structName */        "PixelShaderFxData",
@@ -49,7 +54,7 @@ ShaderFxTypeInfo shaderfx_Type_Pixel = {
 	/* type */              eShaderFxType_GpencilType,
 	/* flags */             eShaderFxTypeFlag_Single,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 
 	/* initData */          initData,
 	/* freeData */          NULL,
diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.c b/source/blender/shader_fx/intern/FX_shader_swirl.c
index e8c103bebd2..da8dfeb870c 100644
--- a/source/blender/shader_fx/intern/FX_shader_swirl.c
+++ b/source/blender/shader_fx/intern/FX_shader_swirl.c
@@ -53,6 +53,11 @@ static void initData(ShaderFxData *md)
 	gpmd->angle = M_PI_2;
 }
 
+static void copyData(const ShaderFxData *md, ShaderFxData *target)
+{
+	BKE_shaderfx_copyData_generic(md, target);
+}
+
 static void updateDepsgraph(ShaderFxData *fx, const ModifierUpdateDepsgraphContext *ctx)
 {
 	SwirlShaderFxData *fxd = (SwirlShaderFxData *)fx;
@@ -86,7 +91,7 @@ ShaderFxTypeInfo shaderfx_Type_Swirl = {
 	/* type */              eShaderFxType_GpencilType,
 	/* flags */             eShaderFxTypeFlag_Single,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 
 	/* initData */          initData,
 	/* freeData */          NULL,
diff --git a/source/blender/shader_fx/intern/FX_shader_wave.c b/source/blender/shader_fx/intern/FX_shader_wave.c
index 107612245e5..ea4563a00e1 100644
--- a/source/blender/shader_fx/intern/FX_shader_wave.c
+++ b/source/blender/shader_fx/intern/FX_shader_wave.c
@@ -47,6 +47,11 @@ static void initData(ShaderFxData *fx)
 	gpfx->orientation = 1;
 }
 
+static void copyData(const ShaderFxData *md, ShaderFxData *target)
+{
+	BKE_shaderfx_copyData_generic(md, target);
+}
+
 ShaderFxTypeInfo shaderfx_Type_Wave = {
 	/* name */              "Wave Distorsion",
 	/* structName */        "WaveShaderFxData",
@@ -54,7 +59,7 @@ ShaderFxTypeInfo shaderfx_Type_Wave = {
 	/* type */              eShaderFxType_GpencilType,
 	/* flags */             eShaderFxTypeFlag_Single,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 
 	/* initData */          initData,
 	/* freeData */          NULL,