[Bf-blender-cvs] [143a44caeb4] master: GPencil: Fix unreported missing VFX in Video Editor

Antonio Vazquez noreply at git.blender.org
Thu Aug 15 13:15:20 CEST 2019


Commit: 143a44caeb4dc00f27b66b55d35a868127b5e4a9
Author: Antonio Vazquez
Date:   Thu Aug 15 13:14:43 2019 +0200
Branches: master
https://developer.blender.org/rB143a44caeb4dc00f27b66b55d35a868127b5e4a9

GPencil: Fix unreported missing VFX in Video Editor

As the video editor mode is not Render mode the VFX was omitted.

Now, the mode is only checked for View3D.

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

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

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 16162645f3d..db216c5eb2d 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -564,6 +564,8 @@ static void gpencil_add_draw_data(void *vedata, Object *ob)
   GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
   bGPdata *gpd = (bGPdata *)ob->data;
   const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
+  const DRWContextState *draw_ctx = DRW_context_state_get();
+  View3D *v3d = draw_ctx->v3d;
 
   int i = stl->g_data->gp_cache_used - 1;
   tGPencilObjectCache *cache_ob = &stl->g_data->gp_object_cache[i];
@@ -580,7 +582,9 @@ static void gpencil_add_draw_data(void *vedata, Object *ob)
 
   /* FX passses */
   cache_ob->has_fx = false;
-  if ((!stl->storage->simplify_fx) && (!ELEM(cache_ob->shading_type[0], OB_WIRE, OB_SOLID)) &&
+  if ((!stl->storage->simplify_fx) &&
+      ((!ELEM(cache_ob->shading_type[0], OB_WIRE, OB_SOLID)) ||
+       ((v3d->spacetype != SPACE_VIEW3D))) &&
       (BKE_shaderfx_has_gpencil(ob))) {
     cache_ob->has_fx = true;
     if ((!stl->storage->simplify_fx) && (!is_multiedit)) {



More information about the Bf-blender-cvs mailing list