diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-12 17:12:28 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-12 17:12:50 +0300 |
commit | 6b815ae55db81dc4d377636f14cb491cb7dde252 (patch) | |
tree | a662da04960a26628765939686950b057083ad1e /source/blender/editors/mesh/meshtools.c | |
parent | 642728b3395a49895526348e7a8b294e72ef6dcf (diff) |
Fix T51184: Crash of Blender when I try to join an object with one that has booleans modifiers
Diffstat (limited to 'source/blender/editors/mesh/meshtools.c')
-rw-r--r-- | source/blender/editors/mesh/meshtools.c | 4 |
1 files changed, 4 insertions, 0 deletions
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); |