[Bf-blender-cvs] [9d32b9fb8a7] blender2.8: GP: Fix unreported error moving material slots
Antonioya
noreply at git.blender.org
Tue Nov 6 13:08:53 CET 2018
Commit: 9d32b9fb8a7f7ed9378a14372975bd58aa2c07dd
Author: Antonioya
Date: Tue Nov 6 13:08:31 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB9d32b9fb8a7f7ed9378a14372975bd58aa2c07dd
GP: Fix unreported error moving material slots
===================================================================
M source/blender/blenkernel/intern/material.c
===================================================================
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index b6ea88597fd..6c13a7d3729 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -798,7 +798,7 @@ void BKE_material_remap_object(Object *ob, const unsigned int *remap)
else if (ELEM(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
BKE_curve_material_remap(ob->data, remap, ob->totcol);
}
- if (ob->type == OB_GPENCIL) {
+ else if (ob->type == OB_GPENCIL) {
BKE_gpencil_material_remap(ob->data, remap, ob->totcol);
}
else {
More information about the Bf-blender-cvs
mailing list