Commit: dcd049321f24e1f0c5ea63f66d52c285f86e1e11
Author: Antonio Vazquez
Date: Wed Apr 4 16:17:07 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdcd049321f24e1f0c5ea63f66d52c285f86e1e11
Cleanup: Remove redundant object 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 2802169fcd7..68c2c621f20 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(&e_data,
vedata, ob, cache);
+ DRW_gpencil_vfx_modifiers(&e_data,
vedata, 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 e19a95b8cee..47acffc8c26 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(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 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 cdf9dfb1668..53a1756e377 100644
--- a/source/blender/draw/engines/gpencil/gpencil_vfx.c
+++ b/source/blender/draw/engines/gpencil/gpencil_vfx.c
@@ -107,7 +107,7 @@ static bool modifier_is_active(Object *ob, ModifierData
*md, bool is_render)
/* Wave Distorsion VFX */
static void DRW_gpencil_vfx_wave(
ModifierData *md, int ob_idx, GPENCIL_e_data *e_data, GPENCIL_Data
*vedata,
- Object *UNUSED(ob), tGPencilObjectCache *cache)
+ tGPencilObjectCache *cache)
{
if (md == NULL) {
return;
@@ -144,7 +144,7 @@ static void DRW_gpencil_vfx_wave(
*/
static void DRW_gpencil_vfx_blur(
ModifierData *md, int ob_idx, GPENCIL_e_data *e_data, GPENCIL_Data
*vedata,
- Object *UNUSED(ob), tGPencilObjectCache *cache)
+ tGPencilObjectCache *cache)
{
if (md == NULL) {
return;
@@ -221,12 +221,12 @@ static void DRW_gpencil_vfx_blur(
/* Pixelate VFX */
static void DRW_gpencil_vfx_pixel(
ModifierData *md, int ob_idx, GPENCIL_e_data *e_data, GPENCIL_Data
*vedata,
- Object *ob, tGPencilObjectCache *cache)
+ tGPencilObjectCache *cache)
{
if (md == NULL) {
return;
}
-
+ Object *ob = cache->ob;
GpencilPixelModifierData *mmd = (GpencilPixelModifierData *)md;
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@@ -261,12 +261,12 @@ static void DRW_gpencil_vfx_pixel(
/* Swirl VFX */
static void DRW_gpencil_vfx_swirl(
ModifierData *md, int ob_idx, GPENCIL_e_data *e_data, GPENCIL_Data
*vedata,
- Object *ob, tGPencilObjectCache *cache)
+ tGPencilObjectCache *cache)
{
if (md == NULL) {
return;
}
-
+ Object *ob = cache->ob;
GpencilSwirlModifierData *mmd = (GpencilSwirlModifierData *)md;
if (mmd->object == NULL) {
return;
@@ -307,12 +307,12 @@ static void DRW_gpencil_vfx_swirl(
/* Flip VFX */
static void DRW_gpencil_vfx_flip(
ModifierData *md, int ob_idx, GPENCIL_e_data *e_data, GPENCIL_Data
*vedata,
- Object *ob, tGPencilObjectCache *cache)
+ tGPencilObjectCache *cache)
{
if (md == NULL) {
return;
}
-
+ Object *ob = cache->ob;
GpencilFlipModifierData *mmd = (GpencilFlipModifierData *)md;
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
@@ -378,12 +378,12 @@ static bool get_normal_vector(bGPdata *gpd, float
r_point[3], float r_normal[3])
/* Light VFX */
static void DRW_gpencil_vfx_light(
ModifierData *md, int ob_idx, GPENCIL_e_data *e_data, GPENCIL_Data
*vedata,
- Object *ob, tGPencilObjectCache *cache)
+ tGPencilObjectCache *cache)
{
if (md == NULL) {
return;
}
-
+ Object *ob = cache->ob;
GpencilLightModifierData *mmd = (GpencilLightModifierData *)md;
if (mmd->object == NULL) {
@@ -436,9 +436,10 @@ static void DRW_gpencil_vfx_light(
void DRW_gpencil_vfx_modifiers(
struct GPENCIL_e_data *e_data, struct GPENCIL_Data *vedata,
- struct Object *ob, struct tGPencilObjectCache *cache)
+ struct tGPencilObjectCache *cache)
{
GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
+ Object *ob = cache->ob;
int ob_idx = cache->idx;
/* loop VFX modifiers
* copy the original texture if wave modifier did not copy before
@@ -447,22 +448,22 @@ void DRW_gpencil_vfx_modifiers(
if (modifier_is_active(ob, md, stl->storage->is_render)) {
switch (md->type) {
case eModifierType_GpencilWave:
- DRW_gpencil_vfx_wave(md, ob_idx,
e_data, vedata, ob, cache);
+ DRW_gpencil_vfx_wave(md, ob_idx,
e_data, vedata, cache);
break;
case eModifierType_GpencilBlur:
- DRW_gpencil_vfx_blur(md, ob_idx,
e_data, vedata, ob, cache);
+ DRW_gpencil_vfx_blur(md, ob_idx,
e_data, vedata, cache);
break;
case eModifierType_GpencilPixel:
- DRW_gpencil_vfx_pixel(md, ob_idx,
e_data, vedata, ob, cache);
+ DRW_gpencil_vfx_pixel(md, ob_idx,
e_data, vedata, cache);
break;
case eModifierType_GpencilSwirl:
- DRW_gpencil_vfx_swirl(md, ob_idx,
e_data, vedata, ob, cache);
+ DRW_gpencil_vfx_swirl(md, ob_idx,
e_data, vedata, cache);
break;
case eModifierType_GpencilFlip:
- DRW_gpencil_vfx_flip(md, ob_idx,
e_data, vedata, ob, cache);
+ DRW_gpencil_vfx_flip(md, ob_idx,
e_data, vedata, cache);
break;
case eModifierType_GpencilLight:
- DRW_gpencil_vfx_light(md, ob_idx,
e_data, vedata, ob, cache);
+ DRW_gpencil_vfx_light(md, ob_idx,
e_data, vedata, cache);
break;
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
