[Bf-blender-cvs] [b756456929a] greasepencil-object: Cleanup: Remove object index parameter for vfx

[Antonio Vazquez]

Commit: b756456929a9d38f161e833df4cc1245adadc570
Author: Antonio Vazquez
Date:   Wed Apr 4 16:10:55 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb756456929a9d38f161e833df4cc1245adadc570

Cleanup: Remove object index parameter for vfx

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

M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/draw/engines/gpencil/gpencil_engine.h
M	source/blender/draw/engines/gpencil/gpencil_vfx.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 3368b905359..2802169fcd7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -598,7 +598,7 @@ static void GPENCIL_cache_finish(void *vedata)
 			if (!stl->storage->simplify_vfx) {
 				cache = &stl->g_data->gp_object_cache[i];
 				if ((!is_multiedit) && (ob->modifiers.first)) {
-					DRW_gpencil_vfx_modifiers(i, &e_data, vedata, ob, cache);
+					DRW_gpencil_vfx_modifiers(&e_data, vedata, ob, cache);
 				}
 			}
 			/* if render set to dirty to refresh viewport */
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 4be9ccdadf6..e19a95b8cee 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -383,7 +383,7 @@ void gpencil_object_cache_add(struct tGPencilObjectCache *cache, struct Object *
 
 void gpencil_array_modifiers(struct GPENCIL_StorageList *stl, struct Object *ob);
 
-void DRW_gpencil_vfx_modifiers(int ob_idx, struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata, struct Object *ob, struct tGPencilObjectCache *cache);
+void DRW_gpencil_vfx_modifiers(struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata, struct Object *ob, struct tGPencilObjectCache *cache);
 bool gpencil_object_use_vfx(struct Object *ob);
 
 /* depth of field */
diff --git a/source/blender/draw/engines/gpencil/gpencil_vfx.c b/source/blender/draw/engines/gpencil/gpencil_vfx.c
index 7c36d62b0ed..cdf9dfb1668 100644
--- a/source/blender/draw/engines/gpencil/gpencil_vfx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_vfx.c
@@ -435,11 +435,11 @@ static void DRW_gpencil_vfx_light(
 }
 
 void DRW_gpencil_vfx_modifiers(
-        int ob_idx, struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata,
+        struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata,
         struct Object *ob, struct tGPencilObjectCache *cache)
 {
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
-
+	int ob_idx = cache->idx;
 	/* loop VFX modifiers
 	 * copy the original texture if wave modifier did not copy before
 	 */