[Bf-blender-cvs] [8314c3188c2] master: Fix clipboard copying collections when copying objects from 3DView.

Bastien Montagne noreply at git.blender.org
Thu Mar 21 09:47:59 CET 2019


Commit: 8314c3188c27c2d4bd3df3134cb072ae833e0a4e
Author: Bastien Montagne
Date:   Thu Mar 21 09:42:49 2019 +0100
Branches: master
https://developer.blender.org/rB8314c3188c27c2d4bd3df3134cb072ae833e0a4e

Fix clipboard copying collections when copying objects from 3DView.

This was inherited from 2.7x behavior with groups, but in 2.8
collections are also used as 2.7x layers, which turns to be a problem
when pasting back clipboard content, since it would instantiate
collections instead of objects, quickly leading to tens of new
collections in the viewlayer...

Instead, we only copy selected objects from the 3DView now. On paste
time, those will be added to the active collection.

Last part of fixes related to T61670.

===================================================================

M	source/blender/editors/space_view3d/view3d_ops.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index e551f1ea130..31c9be02311 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -75,19 +75,6 @@ static int view3d_copybuffer_exec(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 
-	for (Collection *collection = bmain->collections.first; collection; collection = collection->id.next) {
-		for (CollectionObject *cob = collection->gobject.first; cob; cob = cob->next) {
-			Object *object = cob->ob;
-
-			if (object && (object->id.tag & LIB_TAG_DOIT)) {
-				BKE_copybuffer_tag_ID(&collection->id);
-				/* don't expand out to all other objects */
-				collection->id.tag &= ~LIB_TAG_NEED_EXPAND;
-				break;
-			}
-		}
-	}
-
 	BLI_make_file_string("/", str, BKE_tempdir_base(), "copybuffer.blend");
 	BKE_copybuffer_save(bmain, str, op->reports);



More information about the Bf-blender-cvs mailing list