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:
authorGermano <germano.costa@ig.com.br>2017-11-17 05:30:07 +0300
committerGermano <germano.costa@ig.com.br>2017-11-17 05:30:07 +0300
commitf60563dd91d2a8cee0fedfd26b7fe01885c164bf (patch)
tree971d4267349c2a78fa9ab2143a4185c379cd1ca0
parent936ddde35cabc7f694bf0e83b3c8e505f0385532 (diff)
Fix error when compiling with msvc
'function': incompatible types - from 'int *' to 'short *'
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
index 6d7e8a85e77..7ebfc12e143 100644
--- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
+++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c
@@ -100,7 +100,7 @@ static int node_shader_gpu_bsdf_principled(GPUMaterial *mat, bNode *node, bNodeE
/* SSS Profile */
if (node->sss_id == 0) {
- static int profile = SHD_SUBSURFACE_BURLEY;
+ static short profile = SHD_SUBSURFACE_BURLEY;
bNodeSocket *socket = BLI_findlink(&node->original->inputs, 2);
bNodeSocketValueRGBA *socket_data = socket->default_value;
/* For some reason it seems that the socket value is in ARGB format. */