[Bf-blender-cvs] [1292aae5c0d] blender2.8: Correction to previous commit.

Bastien Montagne noreply at git.blender.org
Tue Jun 19 18:30:24 CEST 2018


Commit: 1292aae5c0d8f770b24a8ab7b12d04a6e2392dbf
Author: Bastien Montagne
Date:   Tue Jun 19 18:29:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1292aae5c0d8f770b24a8ab7b12d04a6e2392dbf

Correction to previous commit.

There is no guarantee that given ob pointer is not also an evaluated one
here...

===================================================================

M	source/blender/blenkernel/intern/DerivedMesh.c

===================================================================

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 889b3f681e6..b2542ace86e 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -3062,7 +3062,7 @@ static CustomDataMask object_get_datamask(const Depsgraph *depsgraph, Object *ob
 		*r_need_mapping = false;
 	}
 
-	if (ob == actob) {
+	if (DEG_get_original_object(ob) == actob) {
 		bool editing = BKE_paint_select_face_test(ob);
 
 		/* weight paint and face select need original indices because of selection buffer drawing */



More information about the Bf-blender-cvs mailing list