Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2021-06-30 15:14:14 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2021-06-30 18:29:14 +0300
commitca12d70af0ff4397ed1ce9b5d7d1adadb06e569c (patch)
treebf26a01f4c38519acbd770f1ef7d7e56606a2390
parent5737193d81a15892f1807b13bf0a5da001c2e2e4 (diff)
Cleanup: variable naming for texture/material SocketPropertyType
Copy-Pasting error in rB3025c348253a Maniphest Tasks: T88701 Differential Revision: https://developer.blender.org/D11755
-rw-r--r--source/blender/modifiers/intern/MOD_nodes.cc8
1 files changed, 4 insertions, 4 deletions
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;