[Bf-blender-cvs] [ae43b1d51b4] master: Fix T69364: GPencil Array Modifiers causes crash

Antonio Vazquez noreply at git.blender.org
Sun Sep 1 09:31:45 CEST 2019


Commit: ae43b1d51b4a0384c2197a6aca5cd2810c9283ff
Author: Antonio Vazquez
Date:   Sun Sep 1 09:31:20 2019 +0200
Branches: master
https://developer.blender.org/rBae43b1d51b4a0384c2197a6aca5cd2810c9283ff

Fix T69364: GPencil Array Modifiers causes crash

This bug was introduced when adding the support for default materials.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M	source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index 5209313f717..b44965707d8 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -88,7 +88,7 @@ bool is_stroke_affected_by_modifier(Object *ob,
                                     bool inv3,
                                     bool inv4)
 {
-  Material *ma = give_current_material(ob, gps->mat_nr + 1);
+  Material *ma = BKE_material_gpencil_get(ob, gps->mat_nr + 1);
   MaterialGPencilStyle *gp_style = ma->gp_style;
 
   /* omit if filter by layer */
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
index 741acfbe405..cb429b874a2 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
@@ -119,7 +119,7 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData
     for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
       for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 
-        Material *mat = give_current_material(ob, gps->mat_nr + 1);
+        Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1);
         if (mat == NULL) {
           continue;
         }
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 346d1e834a6..c2ab672b68b 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -137,7 +137,7 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData
     for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
       for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 
-        Material *mat = give_current_material(ob, gps->mat_nr + 1);
+        Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1);
         if (mat == NULL) {
           continue;
         }
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
index bfb2c62cef6..f6ddcf89bcf 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
@@ -125,7 +125,7 @@ static void bakeModifier(Main *bmain, Depsgraph *depsgraph, GpencilModifierData
     for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
       for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 
-        Material *mat = give_current_material(ob, gps->mat_nr + 1);
+        Material *mat = BKE_material_gpencil_get(ob, gps->mat_nr + 1);
         if (mat == NULL) {
           continue;
         }



More information about the Bf-blender-cvs mailing list