[Bf-blender-cvs] [6064ffdc83] render-layers: bpy.ops.collections.* accessible outside collection editor

Dalai Felinto noreply at git.blender.org
Tue Jan 31 13:07:09 CET 2017


Commit: 6064ffdc835b1ca6a52b88e5a5fdfee8cfaadbb8
Author: Dalai Felinto
Date:   Tue Jan 31 13:05:02 2017 +0100
Branches: render-layers
https://developer.blender.org/rB6064ffdc835b1ca6a52b88e5a5fdfee8cfaadbb8

bpy.ops.collections.* accessible outside collection editor

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

M	source/blender/editors/space_collections/collections_ops.c

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

diff --git a/source/blender/editors/space_collections/collections_ops.c b/source/blender/editors/space_collections/collections_ops.c
index 123a722fc3..7e1bf8091b 100644
--- a/source/blender/editors/space_collections/collections_ops.c
+++ b/source/blender/editors/space_collections/collections_ops.c
@@ -49,10 +49,6 @@ static SceneCollection *collection_manager_collection_active(bContext *C)
 
 static int operator_not_master_collection_active(bContext *C)
 {
-	if (ED_operator_collections_active(C) == false) {
-		return 0;
-	}
-
 	SceneCollection *sc = collection_manager_collection_active(C);
 	if (sc == NULL) {
 		return 1;
@@ -63,10 +59,6 @@ static int operator_not_master_collection_active(bContext *C)
 
 static int operator_top_collection_active(bContext *C)
 {
-	if (ED_operator_collections_active(C) == false) {
-		return 0;
-	}
-
 	SceneCollection *sc = collection_manager_collection_active(C);
 	if (sc == NULL) {
 		return 0;
@@ -79,9 +71,6 @@ static int operator_top_collection_active(bContext *C)
 
 static int operator_collection_active(bContext *C)
 {
-	if (ED_operator_collections_active(C) == false) {
-		return 0;
-	}
 	return collection_manager_collection_active(C) ? 1 : 0;
 }
 
@@ -104,7 +93,6 @@ static void COLLECTIONS_OT_collection_link(wmOperatorType *ot)
 
 	/* api callbacks */
 	ot->invoke = collection_link_invoke;
-	ot->poll = ED_operator_collections_active;
 
 	/* flags */
 	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;




More information about the Bf-blender-cvs mailing list