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:
authorAras Pranckevicius <aras@nesnausk.org>2022-08-02 09:28:17 +0300
committerAras Pranckevicius <aras@nesnausk.org>2022-08-02 09:28:17 +0300
commit02b1a209be88dc58cb635b79f4d4b300a86733e9 (patch)
tree035f600d1832dedc15ca1ea02487b7f9548da179 /source/blender/editors
parent2542fda14d851674f0ab109a0a84bab1f4040f8a (diff)
Fix T100118: Crash after Shift+D with nothing selected and then making new object
Regression from rB2d041fc46823, the "nothing to do, return" code path was not re-enabling layer collection sync. Fixes T100118.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/object/object_add.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc
index e9abf8c1441..55366348f38 100644
--- a/source/blender/editors/object/object_add.cc
+++ b/source/blender/editors/object/object_add.cc
@@ -3715,13 +3715,13 @@ static int duplicate_exec(bContext *C, wmOperator *op)
}
}
CTX_DATA_END;
+ /* Sync the collection now, after everything is duplicated. */
+ BKE_layer_collection_resync_allow();
+ BKE_main_collection_sync(bmain);
if (source_bases_new_objects.is_empty()) {
return OPERATOR_CANCELLED;
}
- /* Sync the collection now, after everything is duplicated. */
- BKE_layer_collection_resync_allow();
- BKE_main_collection_sync(bmain);
/* After sync we can get to the new Base data, process it here. */
for (const auto &item : source_bases_new_objects) {