[Bf-blender-cvs] [ca12d70af0f] master: Cleanup: variable naming for texture/material SocketPropertyType

[Philipp Oeser]

Commit: ca12d70af0ff4397ed1ce9b5d7d1adadb06e569c
Author: Philipp Oeser
Date:   Wed Jun 30 14:14:14 2021 +0200
Branches: master
https://developer.blender.org/rBca12d70af0ff4397ed1ce9b5d7d1adadb06e569c

Cleanup: variable naming for texture/material SocketPropertyType

Copy-Pasting error in rB3025c348253a

Maniphest Tasks: T88701

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

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

M	source/blender/modifiers/intern/MOD_nodes.cc

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

diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc
index d776adeff75..f7f7c7b0276 100644
--- a/source/blender/modifiers/intern/MOD_nodes.cc
+++ b/source/blender/modifiers/intern/MOD_nodes.cc
@@ -584,7 +584,7 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
       return &collection_type;
     }
     case SOCK_TEXTURE: {
-      static const SocketPropertyType collection_type = {
+      static const SocketPropertyType texture_type = {
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueTexture *value = (bNodeSocketValueTexture *)socket.default_value;
             IDPropertyTemplate idprop = {0};
@@ -602,10 +602,10 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
             *(Tex **)r_value = texture;
           },
       };
-      return &collection_type;
+      return &texture_type;
     }
     case SOCK_MATERIAL: {
-      static const SocketPropertyType collection_type = {
+      static const SocketPropertyType material_type = {
           [](const bNodeSocket &socket, const char *name) {
             bNodeSocketValueMaterial *value = (bNodeSocketValueMaterial *)socket.default_value;
             IDPropertyTemplate idprop = {0};
@@ -623,7 +623,7 @@ static const SocketPropertyType *get_socket_property_type(const bNodeSocket &bso
             *(Material **)r_value = material;
           },
       };
-      return &collection_type;
+      return &material_type;
     }
     default: {
       return nullptr;