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

This commit is contained in:
Sergey Sharybin 2017-04-12 16:12:28 +02:00
parent 642728b339
commit 6b815ae55d

@ -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);