Commit: e426838798d4ceb306617d9ecda2b4a2df18d63a
Author: Campbell Barton
Date:   Tue Mar 13 20:16:15 2018 +1100
Branches: temp-object-multi-mode
https://developer.blender.org/rBe426838798d4ceb306617d9ecda2b4a2df18d63a

Fix assert entering edit mode w/ multiple objects

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

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

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

diff --git a/source/blender/blenkernel/intern/object_update.c 
b/source/blender/blenkernel/intern/object_update.c
index ada3838830e..e9af3a3d74e 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -173,7 +173,15 @@ void BKE_object_handle_data_update(
        switch (ob->type) {
                case OB_MESH:
                {
+#if 0
                        BMEditMesh *em = (eval_ctx->object_mode & OB_MODE_EDIT) 
? BKE_editmesh_from_object(ob) : NULL;
+#else
+                       BMEditMesh *em = (eval_ctx->object_mode & OB_MODE_EDIT) 
? ((Mesh *)ob->data)->edit_btmesh : NULL;
+                       if (em && em->ob != ob) {
+                               em = NULL;
+                       }
+#endif
+
                        uint64_t data_mask = scene->customdata_mask | 
CD_MASK_BAREMESH;
 #ifdef WITH_FREESTYLE
                        /* make sure Freestyle edge/face marks appear in DM for 
render (see T40315) */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to