2.5

Cleanup

- for portablity we can keep the old ugly defines for retrieving
  active object, cfra and so on. But, they will use 'scene' not
  G.scene.
- fixed code that uses those defines.
- some unused variables/functions removed

3 files changed, 7 insertions, 4 deletions

diff --git a/source/blender/render/extern/include/RE_render_ext.h b/source/blender/render/extern/include/RE_render_ext.h
index 08df53221c8..20eea0c98bd 100644
--- a/source/blender/render/extern/include/RE_render_ext.h
+++ b/source/blender/render/extern/include/RE_render_ext.h
@@ -36,8 +36,9 @@
 
 /* called by meshtools */
 struct View3D;
+struct Scene;
 
-void	RE_make_sticky(struct View3D *v3d);
+void	RE_make_sticky(struct Scene *scene, struct View3D *v3d);
 	
 /* for radiosity module */	
 struct RadView;
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index e24748fecff..8e377e266b1 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -1473,7 +1473,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	MCol *mcol= 0;
 	float loc[3],loc1[3],loc0[3],vel[3],mat[4][4],nmat[3][3],co[3],nor[3],time;
 	float *orco=0,*surfnor=0,*uvco=0, strandlen=0.0f, curlen=0.0f;
-	float hasize, pa_size, pa_time, r_tilt, cfra=bsystem_time(ob,(float)CFRA,0.0);
+	float hasize, pa_size, pa_time, r_tilt, cfra=bsystem_time(ob,(float)re->scene->r.cfra,0.0);
 	float adapt_angle=0.0, adapt_pix=0.0, random, simplify[2];
 	int i, a, k, max_k=0, totpart, totuv=0, totcol=0, override_uv=-1, dosimplify = 0, dosurfacecache = 0;
 	int path_possible=0, keys_possible=0, baked_keys=0, totchild=0;
@@ -1570,7 +1570,7 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
 	}
 
 	if(part->flag&PART_GLOB_TIME)
-		cfra=bsystem_time(0,(float)CFRA,0.0);
+		cfra=bsystem_time(0,(float)re->scene->r.cfra,0.0);
 
 	if(part->type==PART_REACTOR){
 		psys_get_reactor_target(ob, psys, &tob, &tpsys);
@@ -5512,7 +5512,7 @@ void RE_Database_Baking(Render *re, Scene *scene, int type, Object *actob)
 /* Sticky texture coords													 */
 /* ------------------------------------------------------------------------- */
 
-void RE_make_sticky(View3D *v3d)
+void RE_make_sticky(Scene *scene, View3D *v3d)
 {
 	Object *ob;
 	Base *base;
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 46a7a1c556c..13be83a6b7b 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -2140,6 +2140,7 @@ void ray_shadow(ShadeInput *shi, LampRen *lar, float *shadfac)
 
 }
 
+#if 0
 /* only when face points away from lamp, in direction of lamp, trace ray and find first exit point */
 static void ray_translucent(ShadeInput *shi, LampRen *lar, float *distfac, float *co)
 {
@@ -2182,4 +2183,5 @@ static void ray_translucent(ShadeInput *shi, LampRen *lar, float *distfac, float
 		*distfac= 0.0f;
 }
 
+#endif