Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-10-11 23:54:15 +0400
committerTon Roosendaal <ton@blender.org>2005-10-11 23:54:15 +0400
commit7a45609dc220a10e02dc77963bbeb6a83542f46d (patch)
treed03784ce5c31b698f501b3b9e6f7056023a1603e /source/blender/src/editcurve.c
parent85939c5839e0dd88939215b69ec3cfea7bac7edb (diff)
Almost-sure-fix for crashes after joining meshes or curves. Was caused by
not updating depsgraph, and still evaluating it.
Diffstat (limited to 'source/blender/src/editcurve.c')
-rw-r--r--source/blender/src/editcurve.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/editcurve.c b/source/blender/src/editcurve.c
index 22a48e86880..f2cb7a9de9b 100644
--- a/source/blender/src/editcurve.c
+++ b/source/blender/src/editcurve.c
@@ -3355,11 +3355,11 @@ void join_curve(int type)
cu= ob->data;
addlisttolist(&cu->nurb, &tempbase);
+ DAG_scene_sort(G.scene); // because we removed object(s), call before editmode!
+
enter_editmode();
exit_editmode(1);
- DAG_scene_sort(G.scene); // because we removed object(s)
-
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWBUTSEDIT, 0);
BIF_undo_push("Join");