[Bf-blender-cvs] [6b815ae55db] master: Fix T51184: Crash of Blender when I try to join an object with one that has booleans modifiers

[Sergey Sharybin]

Commit: 6b815ae55db81dc4d377636f14cb491cb7dde252
Author: Sergey Sharybin
Date:   Wed Apr 12 16:12:28 2017 +0200
Branches: master
https://developer.blender.org/rB6b815ae55db81dc4d377636f14cb491cb7dde252

Fix T51184: Crash of Blender when I try to join an object with one that has 
booleans modifiers

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

M       source/blender/editors/mesh/meshtools.c

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

diff --git a/source/blender/editors/mesh/meshtools.c 
b/source/blender/editors/mesh/meshtools.c
index 743efb246ab..7faa1dd99e1 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -57,6 +57,7 @@
 #include "BKE_main.h"
 #include "BKE_mesh.h"
 #include "BKE_material.h"
+#include "BKE_object.h"
 #include "BKE_report.h"
 #include "BKE_editmesh.h"
 #include "BKE_multires.h"
@@ -596,6 +597,9 @@ int join_mesh_exec(bContext *C, wmOperator *op)
                BKE_key_sort(key);
        }
 
+       /* Due to dependnecy cycle some other object might access old derived 
data. */
+       BKE_object_free_derived_caches(ob);
+
        DAG_relations_tag_update(bmain);   /* removed objects, need to rebuild 
dag */
 
        DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);

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