[Bf-blender-cvs] [0efee91b630] functions: rename tree type

Jacques Lucke noreply at git.blender.org
Fri Mar 22 11:57:59 CET 2019


Commit: 0efee91b630f0d86f14164e6baeafe66170b64d0
Author: Jacques Lucke
Date:   Fri Mar 22 10:51:53 2019 +0100
Branches: functions
https://developer.blender.org/rB0efee91b630f0d86f14164e6baeafe66170b64d0

rename tree type

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

M	release/scripts/startup/function_nodes/base.py
M	release/scripts/startup/function_nodes/menu.py
M	release/scripts/startup/function_nodes/search.py
M	release/scripts/startup/function_nodes/tree_panel.py
M	release/scripts/startup/function_nodes/update.py

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

diff --git a/release/scripts/startup/function_nodes/base.py b/release/scripts/startup/function_nodes/base.py
index 6d494e2d894..a76076ee2b2 100644
--- a/release/scripts/startup/function_nodes/base.py
+++ b/release/scripts/startup/function_nodes/base.py
@@ -16,8 +16,8 @@ class BaseTree:
         update_function_trees()
 
 
-class FunctionNodeTree(bpy.types.NodeTree, BaseTree):
-    bl_idname = "FunctionNodeTree"
+class FunctionTree(bpy.types.NodeTree, BaseTree):
+    bl_idname = "FunctionTree"
     bl_icon = "MOD_DATA_TRANSFER"
     bl_label = "Function Nodes"
 
diff --git a/release/scripts/startup/function_nodes/menu.py b/release/scripts/startup/function_nodes/menu.py
index da5a318f8e9..2ce14b068a6 100644
--- a/release/scripts/startup/function_nodes/menu.py
+++ b/release/scripts/startup/function_nodes/menu.py
@@ -1,9 +1,9 @@
 import bpy
-from . base import FunctionNodeTree
+from . base import FunctionTree
 
 def draw_menu(self, context):
     tree = context.space_data.node_tree
-    if not isinstance(tree, FunctionNodeTree):
+    if not isinstance(tree, FunctionTree):
         return
 
     layout = self.layout
diff --git a/release/scripts/startup/function_nodes/search.py b/release/scripts/startup/function_nodes/search.py
index 883c7914e57..db05a78a5d6 100644
--- a/release/scripts/startup/function_nodes/search.py
+++ b/release/scripts/startup/function_nodes/search.py
@@ -20,7 +20,7 @@ class NodeSearch(bpy.types.Operator):
 
     @classmethod
     def poll(cls, context):
-        try: return context.space_data.node_tree.bl_idname == "FunctionNodeTree"
+        try: return context.space_data.node_tree.bl_idname == "FunctionTree"
         except: return False
 
     def invoke(self, context, event):
diff --git a/release/scripts/startup/function_nodes/tree_panel.py b/release/scripts/startup/function_nodes/tree_panel.py
index 6457fc86131..41b4feb9b1f 100644
--- a/release/scripts/startup/function_nodes/tree_panel.py
+++ b/release/scripts/startup/function_nodes/tree_panel.py
@@ -1,5 +1,5 @@
 import bpy
-from . base import FunctionNodeTree
+from . base import FunctionTree
 
 class TreePanel(bpy.types.Panel):
     bl_idname = "fn_tree_panel"
@@ -10,7 +10,7 @@ class TreePanel(bpy.types.Panel):
 
     @classmethod
     def poll(self, context):
-        try: return isinstance(context.space_data.edit_tree, FunctionNodeTree)
+        try: return isinstance(context.space_data.edit_tree, FunctionTree)
         except: return False
 
     def draw(self, context):
diff --git a/release/scripts/startup/function_nodes/update.py b/release/scripts/startup/function_nodes/update.py
index 9252cf26f19..5661b6dfc86 100644
--- a/release/scripts/startup/function_nodes/update.py
+++ b/release/scripts/startup/function_nodes/update.py
@@ -4,7 +4,7 @@ from contextlib import contextmanager
 
 from . types import type_infos
 from . sockets import OperatorSocket
-from . base import DataSocket, FunctionNodeTree
+from . base import DataSocket, FunctionTree
 from . utils.graph import iter_connected_components
 
 from . socket_decl import (
@@ -38,7 +38,7 @@ def update_function_trees():
 
     with managed_update():
         for tree in bpy.data.node_groups:
-            if isinstance(tree, FunctionNodeTree):
+            if isinstance(tree, FunctionTree):
                 update_function_tree(tree)
 
 def update_function_tree(tree):



More information about the Bf-blender-cvs mailing list