Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonioya <blendergit@gmail.com>2018-08-28 09:16:30 +0300
committerAntonioya <blendergit@gmail.com>2018-08-28 09:18:09 +0300
commit9a9b1e98849131358041cf2bb83bf7b7c9828119 (patch)
tree290cba0b98a1c6937670d8f578c189039123700a /source/blender/gpencil_modifiers
parent039b11f3497731572e36904b03550438b706df34 (diff)
GP: Revert replace custom function by standard API
Using custom api breaks material at object level
Diffstat (limited to 'source/blender/gpencil_modifiers')
-rw-r--r--source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
index 5c2e5e89d0b..9ddc6a1e3e4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
@@ -171,7 +171,7 @@ void gpencil_apply_modifier_material(
DEG_id_tag_update(&newmat->id, DEG_TAG_COPY_ON_WRITE);
}
/* reasign color index */
- int idx = BKE_object_material_slot_find_index(ob, newmat);
+ int idx = BKE_gpencil_get_material_index(ob, newmat);
gps->mat_nr = idx - 1;
}
else {