archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: variable naming for texture/material SocketPropertyType

Browse Source 
Copy-Pasting error in rB3025c348253a

Maniphest Tasks: T88701

Differential Revision: https://developer.blender.org/D11755
This commit is contained in:
Philipp Oeser
2021-06-30 14:14:14 +02:00
parent 5737193d81
commit ca12d70af0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -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;