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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-10-29 12:49:46 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-10-29 12:53:10 +0300
commitc2791777bd8bd4a0375ada74b84c2142c6ce73cc (patch)
tree6ebe4d591ab08cc59b907e562faadad62c218c14 /source/blender/blenkernel/intern/library_remap.c
parent262504ddd190a66f9d8353afc2c2da653a998cc4 (diff)
Fix stupid multiple-call of same function in Collections remapping code.
Related to T57372: Second full scene copy crashes on deletion (fixes deleting second copy, but now it crashes on deleting the first copy...).
Diffstat (limited to 'source/blender/blenkernel/intern/library_remap.c')
-rw-r--r--source/blender/blenkernel/intern/library_remap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/library_remap.c b/source/blender/blenkernel/intern/library_remap.c
index 9e3001de572..114159debe3 100644
--- a/source/blender/blenkernel/intern/library_remap.c
+++ b/source/blender/blenkernel/intern/library_remap.c
@@ -326,9 +326,9 @@ static void libblock_remap_data_postprocess_collection_update(
Main *bmain, Collection *old_collection, Collection *new_collection)
{
if (new_collection == NULL) {
- /* In case we unlinked old_collection (new_collection is NULL), we need
- * to remove any collection children that have been set to NULL in the
- * because of pointer replacement. */
+ /* In case we unlinked old_collection (new_collection is NULL), we need
+ * to remove any collection children that have been set to NULL in the
+ * because of pointer replacement. */
if (old_collection != NULL) {
BKE_collections_child_remove_nulls(bmain, old_collection);
}