[Bf-blender-cvs] [1015755] object_nodes: Object node id property poll function should be a regular function rather that a classmethod.

[Lukas Tönne]

Commit: 10157551be9ba8baa8846d1e1ce441eb15c9df39
Author: Lukas Tönne
Date:   Sat Dec 5 11:27:59 2015 +0100
Branches: object_nodes
https://developer.blender.org/rB10157551be9ba8baa8846d1e1ce441eb15c9df39

Object node id property poll function should be a regular function rather that a classmethod.

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

M	release/scripts/nodes/__init__.py
M	release/scripts/nodes/object_nodes.py
M	source/blender/makesrna/intern/rna_nodetree.c

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

diff --git a/release/scripts/nodes/__init__.py b/release/scripts/nodes/__init__.py
index c492b06..cfbb096 100644
--- a/release/scripts/nodes/__init__.py
+++ b/release/scripts/nodes/__init__.py
@@ -39,7 +39,6 @@ del _namespace
 
 
 def register():
-    print("REGISTER!")
     bpy.utils.register_module(__name__)
 
 
diff --git a/release/scripts/nodes/object_nodes.py b/release/scripts/nodes/object_nodes.py
index caf61f7..199c42d 100644
--- a/release/scripts/nodes/object_nodes.py
+++ b/release/scripts/nodes/object_nodes.py
@@ -73,8 +73,7 @@ class GeometryNode(ObjectNodeBase, ObjectNode):
     bl_icon = 'MESH_DATA'
 
     bl_id_property_type = 'NODETREE'
-    @classmethod
-    def bl_id_property_poll(cls, ntree):
+    def bl_id_property_poll(self, ntree):
         return ntree.bl_idname == 'GeometryNodeTree'
 
     def draw_buttons(self, context, layout):
@@ -91,8 +90,7 @@ class ForceFieldNode(ObjectNodeBase, ObjectNode):
     bl_icon = 'FORCE_FORCE'
 
     bl_id_property_type = 'NODETREE'
-    @classmethod
-    def bl_id_property_poll(cls, ntree):
+    def bl_id_property_poll(self, ntree):
         return ntree.bl_idname == 'ForceFieldNodeTree'
 
     def draw_buttons(self, context, layout):
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 7d6a75e..a80f8b8 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -6806,7 +6806,7 @@ static void rna_def_object_node(BlenderRNA *brna)
 	/* poll */
 	func = RNA_def_function(srna, "bl_id_property_poll", NULL);
 	RNA_def_function_ui_description(func, "If non-null output is returned, the id pointer can be used in the node");
-	RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_REGISTER_OPTIONAL);
+	RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_REGISTER_OPTIONAL);
 	RNA_def_function_return(func, RNA_def_boolean(func, "result", false, "", ""));
 	parm = RNA_def_pointer(func, "id", "ID", "ID", "");
 	RNA_def_property_flag(parm, PROP_REQUIRED);