From d63956d0e51c1b5a65941b918d0e055b1c14fa4b Mon Sep 17 00:00:00 2001 From: Antonio Vazquez Date: Mon, 11 May 2020 16:18:08 +0200 Subject: GPencil: Replace material name with material pointer for Modifiers filter Before, the material name was used to filter the effect of the stroke, but after the last changes in the ID code, now it's not working. After talking with @severin, we agreed to replace the material name with a pointer. Also, this fix a design issue when the materials were linked. Related to T76594 Differential Revision: https://developer.blender.org/D7681 with some minor changes --- source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h') diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h index fc4522bc028..5cc3750639b 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h @@ -34,7 +34,7 @@ struct bGPDstroke; bool is_stroke_affected_by_modifier(struct Object *ob, char *mlayername, - char *mmaterialname, + struct Material *material, const int mpassindex, const int gpl_passindex, const int minpoints, -- cgit v1.2.3