[Bf-blender-cvs] [59ce7bf5a94] master: Nodes: better default name for custom node tree datablocks

David Ballesteros noreply at git.blender.org
Thu Jan 5 18:38:31 CET 2023


Commit: 59ce7bf5a941f4513938f50006351ed36e565bc1
Author: David Ballesteros
Date:   Thu Jan 5 18:14:35 2023 +0100
Branches: master
https://developer.blender.org/rB59ce7bf5a941f4513938f50006351ed36e565bc1

Nodes: better default name for custom node tree datablocks

Use NodeTree.bl_label instead of "NodeTree" for more descriptive name.

Implemented by Iliya Katueshenock.

Differential Revision: https://developer.blender.org/D16856

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

M	source/blender/editors/space_node/node_add.cc

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

diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc
index 097056b5464..534222b58e6 100644
--- a/source/blender/editors/space_node/node_add.cc
+++ b/source/blender/editors/space_node/node_add.cc
@@ -844,17 +844,18 @@ static int new_node_tree_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
+  if (!ntreeTypeFind(idname)) {
+    BKE_reportf(op->reports, RPT_ERROR, "Node tree type %s undefined", idname);
+    return OPERATOR_CANCELLED;
+  }
+
   if (RNA_struct_property_is_set(op->ptr, "name")) {
     RNA_string_get(op->ptr, "name", treename_buf);
     treename = treename_buf;
   }
   else {
-    treename = DATA_("NodeTree");
-  }
-
-  if (!ntreeTypeFind(idname)) {
-    BKE_reportf(op->reports, RPT_ERROR, "Node tree type %s undefined", idname);
-    return OPERATOR_CANCELLED;
+    const bNodeTreeType *type = ntreeTypeFind(idname);
+    treename = type->ui_name;
   }
 
   ntree = ntreeAddTree(bmain, treename, idname);



More information about the Bf-blender-cvs mailing list