[Bf-blender-cvs] [c6e8a004a14] blender2.8: Gawain: fix for last commit

Mike Erwin noreply at git.blender.org
Mon Apr 17 10:02:42 CEST 2017


Commit: c6e8a004a1449fad72c58a7f3db7ab87ec743868
Author: Mike Erwin
Date:   Mon Apr 17 04:01:46 2017 -0400
Branches: blender2.8
https://developer.blender.org/rBc6e8a004a1449fad72c58a7f3db7ab87ec743868

Gawain: fix for last commit

Follow-up to 3bc6b831d82724578fc8150d863b54f334db2bf4

Initial code was getting the number of ShaderInterfaces that could fit between two pointers (which makes no sense). I really meant number of bytes.

Surprised it worked on Mac, glad I tested on Windows before bed  :D

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

M	intern/gawain/src/shader_interface.c

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

diff --git a/intern/gawain/src/shader_interface.c b/intern/gawain/src/shader_interface.c
index d5c78a4bbf0..fe175d5e45b 100644
--- a/intern/gawain/src/shader_interface.c
+++ b/intern/gawain/src/shader_interface.c
@@ -204,7 +204,7 @@ ShaderInterface* ShaderInterface_create(GLint program)
 		// realloc shaderface to shrink name buffer
 		ShaderInterface* orig_pointer = shaderface;
 		shaderface = realloc(shaderface, offsetof(ShaderInterface, inputs) + input_ct * sizeof(ShaderInput) + name_buffer_used);
-		const ptrdiff_t delta = shaderface - orig_pointer;
+		const ptrdiff_t delta = (char*)shaderface - (char*)orig_pointer;
 
 		if (delta)
 			{




More information about the Bf-blender-cvs mailing list