[Bf-blender-cvs] [4f32cb14d8f] temp-greasepencil-vfx: Fix some typo errors

[Antonio Vazquez]

Commit: 4f32cb14d8fb408d6fa799178a3b40028ce4d83d
Author: Antonio Vazquez
Date:   Tue Jun 26 20:27:52 2018 +0200
Branches: temp-greasepencil-vfx
https://developer.blender.org/rB4f32cb14d8fb408d6fa799178a3b40028ce4d83d

Fix some typo errors

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

M	source/blender/draw/engines/gpencil/gpencil_fx.c
M	source/blender/makesdna/DNA_shader_fx_types.h
M	source/blender/makesrna/intern/rna_shader_fx.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_fx.c b/source/blender/draw/engines/gpencil/gpencil_fx.c
index 6fec570acb6..a3b73d8df23 100644
--- a/source/blender/draw/engines/gpencil/gpencil_fx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_fx.c
@@ -300,9 +300,7 @@ static void DRW_gpencil_fx_flip(
 	if (fx == NULL) {
 		return;
 	}
-	// Object *ob = cache->ob;
 	FlipShaderFxData *fxd = (FlipShaderFxData *)fx;
-
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
 	GPENCIL_PassList *psl = ((GPENCIL_Data *)vedata)->psl;
 	DRWShadingGroup *fx_shgrp;
@@ -427,9 +425,7 @@ void DRW_gpencil_fx_prepare(
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
 	Object *ob = cache->ob;
 	int ob_idx = cache->idx;
-	/* loop FX 
-	 * copy the original texture if wave modifier did not copy before
-	 */
+	/* loop FX */
 	for (ShaderFxData *fx = ob->shader_fx.first; fx; fx = fx->next) {
 		if (effect_is_active(ob, fx, stl->storage->is_render)) {
 			switch (fx->type) {
diff --git a/source/blender/makesdna/DNA_shader_fx_types.h b/source/blender/makesdna/DNA_shader_fx_types.h
index f4db983e320..3c229539ae7 100644
--- a/source/blender/makesdna/DNA_shader_fx_types.h
+++ b/source/blender/makesdna/DNA_shader_fx_types.h
@@ -18,7 +18,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file DNA_greasepencil_modifier_types.h
+/** \file DNA_shader_fx_types.h
  *  \ingroup DNA
  */
 
@@ -68,7 +68,7 @@ typedef struct ShaderFxData {
 } ShaderFxData;
 
 typedef struct BlurShaderFxData {
-	ShaderFxData modifier;
+	ShaderFxData shaderfx;
 	int radius[2];
 	int flag;                    /* flags */
 	int samples;                 /* number of samples */
@@ -81,7 +81,7 @@ typedef enum eBlurShaderFx_Flag {
 } eBlurShaderFx_Flag;
 
 typedef struct WaveShaderFxData {
-	ShaderFxData modifier;
+	ShaderFxData shaderfx;
 	float amplitude;
 	float period;
 	float phase;
@@ -91,7 +91,7 @@ typedef struct WaveShaderFxData {
 } WaveShaderFxData;
 
 typedef struct PixelShaderFxData {
-	ShaderFxData modifier;
+	ShaderFxData shaderfx;
 	int size[2];
 	int flag;                    /* flags */
 	float rgba[4];
@@ -103,7 +103,7 @@ typedef enum ePixelShaderFx_Flag {
 } ePixelShaderFx_Flag;
 
 typedef struct SwirlShaderFxData {
-	ShaderFxData modifier;
+	ShaderFxData shaderfx;
 	struct Object *object;
 	int flag;                    /* flags */
 	int radius;
@@ -116,7 +116,7 @@ typedef enum eSwirlShaderFx_Flag {
 } eSwirlShaderFx_Flag;
 
 typedef struct FlipShaderFxData {
-	ShaderFxData modifier;
+	ShaderFxData shaderfx;
 	int flag;                    /* flags */
 	char pad[4];
 } FlipShaderFxData;
@@ -127,7 +127,7 @@ typedef enum eFlipShaderFx_Flag {
 } eFlipShaderFx_Flag;
 
 typedef struct LightShaderFxData {
-	ShaderFxData modifier;
+	ShaderFxData shaderfx;
 	struct Object *object;
 	int flag;                    /* flags */
 	float energy;
diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c
index c0bab1a1569..a690d1d5e5c 100644
--- a/source/blender/makesrna/intern/rna_shader_fx.c
+++ b/source/blender/makesrna/intern/rna_shader_fx.c
@@ -144,7 +144,7 @@ static char *rna_ShaderFx_path(PointerRNA *ptr)
 static void rna_ShaderFx_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
 	DEG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
-	WM_main_add_notifier(NC_OBJECT | ND_MODIFIER, ptr->id.data);
+	WM_main_add_notifier(NC_OBJECT | NC_GPENCIL, ptr->id.data);
 }
 
 static void rna_ShaderFx_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr)