[Bf-blender-cvs] [51f0049] master: Cleanup: only check paint mode for active objects
Campbell Barton
noreply at git.blender.org
Tue Oct 6 07:32:02 CEST 2015
Commit: 51f00499cd4e0bd8d80ad7107d13a00bf2ddd904
Author: Campbell Barton
Date: Tue Oct 6 16:24:57 2015 +1100
Branches: master
https://developer.blender.org/rB51f00499cd4e0bd8d80ad7107d13a00bf2ddd904
Cleanup: only check paint mode for active objects
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 20dabbd..e71cfca 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2626,13 +2626,13 @@ static CustomDataMask object_get_datamask(const Scene *scene, Object *ob, bool *
{
Object *actob = scene->basact ? scene->basact->object : NULL;
CustomDataMask mask = ob->customdata_mask;
- bool editing = BKE_paint_select_face_test(ob);
if (r_need_mapping) {
*r_need_mapping = false;
}
if (ob == actob) {
+ bool editing = BKE_paint_select_face_test(ob);
/* weight paint and face select need original indices because of selection buffer drawing */
if (r_need_mapping) {
More information about the Bf-blender-cvs
mailing list