[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18905] branches/blender2.5/blender/source /blender/editors/screen/screen_ops.c: 2.5

Ton Roosendaal ton at blender.org
Tue Feb 10 16:51:33 CET 2009


Revision: 18905
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18905
Author:   ton
Date:     2009-02-10 16:51:33 +0100 (Tue, 10 Feb 2009)

Log Message:
-----------
2.5

Bugfix: Node operators were called in empty node editor, causing
NULL reading. Prevented it from happening with more strict poll()

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-02-10 15:38:00 UTC (rev 18904)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c	2009-02-10 15:51:33 UTC (rev 18905)
@@ -148,7 +148,12 @@
 
 int ED_operator_node_active(bContext *C)
 {
-	return ed_spacetype_test(C, SPACE_NODE);
+	if(ed_spacetype_test(C, SPACE_NODE)) {
+		SpaceNode *snode= (SpaceNode *)CTX_wm_space_data(C);
+		if(snode->edittree)
+			return 1;
+	}
+	return 0;
 }
 
 int ED_operator_ipo_active(bContext *C)





More information about the Bf-blender-cvs mailing list