[Bf-blender-cvs] [6129e20cec4] temp-gpencil-drw-engine: Merge branch 'master' into temp-gpencil-drw-engine

Antonio Vazquez noreply at git.blender.org
Mon Aug 26 11:53:02 CEST 2019


Commit: 6129e20cec4639aebf335ff13b2ba0c59670662d
Author: Antonio Vazquez
Date:   Mon Aug 26 11:52:52 2019 +0200
Branches: temp-gpencil-drw-engine
https://developer.blender.org/rB6129e20cec4639aebf335ff13b2ba0c59670662d

Merge branch 'master' into temp-gpencil-drw-engine

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.c

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



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

diff --cc source/blender/draw/engines/gpencil/gpencil_engine.c
index 5f6f5650ca7,9efae54b376..aa5918feaa8
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@@ -571,7 -564,8 +571,9 @@@ static void gpencil_add_draw_data(void 
    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();
+   const View3D *v3d = draw_ctx->v3d;
 +  tGPencilObjectCache_shgrp *array_elm = NULL;
  
    int i = stl->g_data->gp_cache_used - 1;
    tGPencilObjectCache *cache_ob = &stl->g_data->gp_object_cache[i];
@@@ -586,19 -580,11 +588,21 @@@
      }
    }
  
 +  /* Verify if the object has layer blending */
 +  cache_ob->has_layer_blend = false;
 +  for (int e = 0; e < cache_ob->tot_layers; e++) {
 +    array_elm = &cache_ob->shgrp_array[e];
 +    if ((array_elm->mode != eGplBlendMode_Regular) || (array_elm->mask_layer)) {
 +      cache_ob->has_layer_blend = true;
 +      break;
 +    }
 +  }
 +
    /* 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