[Bf-blender-cvs] [928be30] master: Classic blenderplayer fix + small optimization

Antony Riakiotakis noreply at git.blender.org
Thu Oct 9 16:05:25 CEST 2014


Commit: 928be3013aac4527be44eadd3d662b4b4f05053f
Author: Antony Riakiotakis
Date:   Thu Oct 9 16:05:00 2014 +0200
Branches: master
https://developer.blender.org/rB928be3013aac4527be44eadd3d662b4b4f05053f

Classic blenderplayer fix + small optimization

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

M	source/blender/render/intern/source/render_texture.c
M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 14e84c4..f7e2fd5 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -731,12 +731,11 @@ static int texnoise(Tex *tex, TexResult *texres, int thread)
 
 	/* start from top bits since they have more variance */
 	val= ((ran >> shift) & 3);
-	shift -= 2;
 	
 	while (loop--) {
+		shift -= 2;		
 		val += ((ran >> shift) & 3);
 		div += 3.0f;
-		shift -= 2;		
 	}
 	
 	texres->tin= ((float)val)/div;
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 649ea1f..0846e37 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -221,6 +221,8 @@ void *g_system;
 float *RE_RenderLayerGetPass(struct RenderLayer *rl, int passtype) RET_NULL
 float RE_filter_value(int type, float x) RET_ZERO
 struct RenderLayer *RE_GetRenderLayer(struct RenderResult *rr, const char *name) RET_NULL
+void RE_init_texture_rng() RET_NONE
+void RE_exit_texture_rng() RET_NONE
 
 /* zbuf.c stub */
 void antialias_tagbuf(int xsize, int ysize, char *rectmove) RET_NONE




More information about the Bf-blender-cvs mailing list