[Bf-blender-cvs] [65aac86d5a3] master: GPencil: Fix wrong material when apply Opacity, Hue or Tint modifier
Antonioya
noreply at git.blender.org
Fri Jul 19 15:22:58 CEST 2019
Commit: 65aac86d5a35b23eabf30379c7a44b04860c7b2f
Author: Antonioya
Date: Thu Jul 18 18:07:56 2019 +0200
Branches: master
https://developer.blender.org/rB65aac86d5a35b23eabf30379c7a44b04860c7b2f
GPencil: Fix wrong material when apply Opacity, Hue or Tint modifier
When apply the modifier a new material is created, but it was assigned wrongly. The problem was the index was base 0 already, so subtract 1, got a wrong value.
===================================================================
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
===================================================================
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index bdab4c083e9..5b5290dc0ff 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -192,9 +192,8 @@ void gpencil_apply_modifier_material(
BLI_ghash_insert(gh_color, mat->id.name, newmat);
DEG_id_tag_update(&newmat->id, ID_RECALC_COPY_ON_WRITE);
}
- /* Reaasign color index. */
- int idx = BKE_gpencil_object_material_get_index(ob, newmat);
- gps->mat_nr = idx - 1;
+ /* Reassign color index. */
+ gps->mat_nr = BKE_gpencil_object_material_get_index(ob, newmat);
}
else {
/* reuse existing color (but update only first time) */
More information about the Bf-blender-cvs
mailing list