[Bf-blender-cvs] [bfa5efeebec] blender2.8: Fix MSVC compile (T51740)

Mike Erwin noreply at git.blender.org
Wed Jun 7 22:29:06 CEST 2017


Commit: bfa5efeebecb24d52bd63d79d6fc08518568f5e6
Author: Mike Erwin
Date:   Wed Jun 7 16:28:24 2017 -0400
Branches: blender2.8
https://developer.blender.org/rBbfa5efeebecb24d52bd63d79d6fc08518568f5e6

Fix MSVC compile (T51740)

Gawain doesn't include Blender's cross-platform "inline" definition. This change slipped in as part of D2697.

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

M	intern/gawain/src/shader_interface.c

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

diff --git a/intern/gawain/src/shader_interface.c b/intern/gawain/src/shader_interface.c
index 49fd8b4e649..24f0a9f0e54 100644
--- a/intern/gawain/src/shader_interface.c
+++ b/intern/gawain/src/shader_interface.c
@@ -61,7 +61,7 @@ static unsigned hash_string(const char *str)
 	return i;
 	}
 
-static inline void set_input_name(ShaderInput* input, const char* name)
+static void set_input_name(ShaderInput* input, const char* name)
 	{
 	input->name = name;
 	input->name_hash = hash_string(name);




More information about the Bf-blender-cvs mailing list