[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34371] trunk/blender/source/blender/ editors/space_node/node_edit.c: Bugfix 25683
Ton Roosendaal
ton at blender.org
Mon Jan 17 19:38:44 CET 2011
Revision: 34371
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34371
Author: ton
Date: 2011-01-17 18:38:44 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Bugfix 25683
Compositor operators now have better poll check, so they won't
show up in operator search or hotkeys for other node views.
- backimage move, size
- read renderlayers
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/node_edit.c
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2011-01-17 18:16:10 UTC (rev 34370)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2011-01-17 18:38:44 UTC (rev 34371)
@@ -194,6 +194,17 @@
/* ***************************************** */
+/* operator poll callback */
+static int composite_node_active(bContext *C)
+{
+ if( ED_operator_node_active(C)) {
+ SpaceNode *snode= CTX_wm_space_node(C);
+ if(snode->treetype==NTREE_COMPOSIT)
+ return 1;
+ }
+ return 0;
+}
+
/* also checks for edited groups */
bNode *editnode_get_active(bNodeTree *ntree)
{
@@ -821,7 +832,7 @@
/* api callbacks */
ot->invoke= snode_bg_viewmove_invoke;
ot->modal= snode_bg_viewmove_modal;
- ot->poll= ED_operator_node_active;
+ ot->poll= composite_node_active;
/* flags */
ot->flag= OPTYPE_BLOCKING;
@@ -849,7 +860,7 @@
/* api callbacks */
ot->exec= backimage_zoom;
- ot->poll= ED_operator_node_active;
+ ot->poll= composite_node_active;
/* flags */
ot->flag= OPTYPE_BLOCKING;
@@ -1898,6 +1909,7 @@
/* ******************************** */
// XXX some code needing updating to operators...
+
/* goes over all scenes, reads render layers */
static int node_read_renderlayers_exec(bContext *C, wmOperator *UNUSED(op))
{
@@ -1935,7 +1947,7 @@
ot->exec= node_read_renderlayers_exec;
- ot->poll= ED_operator_node_active;
+ ot->poll= composite_node_active;
/* flags */
ot->flag= 0;
@@ -1966,7 +1978,7 @@
ot->exec= node_read_fullsamplelayers_exec;
- ot->poll= ED_operator_node_active;
+ ot->poll= composite_node_active;
/* flags */
ot->flag= 0;
@@ -2369,7 +2381,7 @@
/* callbacks */
ot->exec= node_add_file_exec;
ot->invoke= node_add_file_invoke;
- ot->poll= ED_operator_node_active;
+ ot->poll= composite_node_active;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
More information about the Bf-blender-cvs
mailing list