[Bf-blender-cvs] [6bc6ffc35c5] master: Fix T91241: wrong labels and identifiers for id sockets

Jacques Lucke noreply at git.blender.org
Wed Sep 8 15:57:32 CEST 2021


Commit: 6bc6ffc35c58ca4ac1ac1a55367e20fc06f5fe3a
Author: Jacques Lucke
Date:   Wed Sep 8 15:57:05 2021 +0200
Branches: master
https://developer.blender.org/rB6bc6ffc35c58ca4ac1ac1a55367e20fc06f5fe3a

Fix T91241: wrong labels and identifiers for id sockets

`nodeAddSocket` expects the name and identifier in a
different order.

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

M	source/blender/nodes/intern/node_socket_declarations.cc

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

diff --git a/source/blender/nodes/intern/node_socket_declarations.cc b/source/blender/nodes/intern/node_socket_declarations.cc
index 418fed146fb..ba9a1870b0c 100644
--- a/source/blender/nodes/intern/node_socket_declarations.cc
+++ b/source/blender/nodes/intern/node_socket_declarations.cc
@@ -274,7 +274,7 @@ bNodeSocket &build_id_socket(bNodeTree &ntree,
                              StringRefNull identifier)
 {
   bNodeSocket &socket = *nodeAddSocket(
-      &ntree, &node, in_out, data.idname, name.c_str(), identifier.c_str());
+      &ntree, &node, in_out, data.idname, identifier.c_str(), name.c_str());
   if (data.hide_label) {
     socket.flag |= SOCK_HIDE_LABEL;
   }



More information about the Bf-blender-cvs mailing list