From f60563dd91d2a8cee0fedfd26b7fe01885c164bf Mon Sep 17 00:00:00 2001 From: Germano Date: Fri, 17 Nov 2017 00:30:07 -0200 Subject: [PATCH] Fix error when compiling with msvc 'function': incompatible types - from 'int *' to 'short *' --- source/blender/nodes/shader/nodes/node_shader_bsdf_principled.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. */