[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29788] branches/render25/source/blender/ render/intern: Render Branch: fix texture nodes + halo rendering problem.

Brecht Van Lommel brecht at blender.org
Tue Jun 29 14:14:05 CEST 2010


Revision: 29788
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29788
Author:   blendix
Date:     2010-06-29 14:14:03 +0200 (Tue, 29 Jun 2010)

Log Message:
-----------
Render Branch: fix texture nodes + halo rendering problem.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/include/texture_stack.h
    branches/render25/source/blender/render/intern/source/halo.c
    branches/render25/source/blender/render/intern/source/texture_stack.c

Modified: branches/render25/source/blender/render/intern/include/texture_stack.h
===================================================================
--- branches/render25/source/blender/render/intern/include/texture_stack.h	2010-06-29 12:13:29 UTC (rev 29787)
+++ branches/render25/source/blender/render/intern/include/texture_stack.h	2010-06-29 12:14:03 UTC (rev 29788)
@@ -46,7 +46,7 @@
 void do_sky_tex(struct Render *re, float *rco, float *lo, float *dxyview,
 	float *hor, float *zen, float *blend, int skyflag, short thread);
 void do_halo_tex(struct Render *re, struct HaloRen *har, float xn, float yn,
-	float *colf);
+	float *colf, int thread);
 void do_volume_tex(struct Render *re, struct ShadeInput *shi, float *xyz,
 	int mapto_flag, float *col, float *val);
 

Modified: branches/render25/source/blender/render/intern/source/halo.c
===================================================================
--- branches/render25/source/blender/render/intern/source/halo.c	2010-06-29 12:13:29 UTC (rev 29787)
+++ branches/render25/source/blender/render/intern/source/halo.c	2010-06-29 12:14:03 UTC (rev 29788)
@@ -296,7 +296,7 @@
 		col[2]= har->b;
 		col[3]= dist;
 		
-		do_halo_tex(re, har, xn, yn, col);
+		do_halo_tex(re, har, xn, yn, col, thread);
 		
 		col[0]*= col[3];
 		col[1]*= col[3];

Modified: branches/render25/source/blender/render/intern/source/texture_stack.c
===================================================================
--- branches/render25/source/blender/render/intern/source/texture_stack.c	2010-06-29 12:13:29 UTC (rev 29787)
+++ branches/render25/source/blender/render/intern/source/texture_stack.c	2010-06-29 12:14:03 UTC (rev 29788)
@@ -1505,7 +1505,7 @@
 				else texvec[2]= mtex->size[2]*(mtex->ofs[2]);
 			}
 			
-			rgbnor= tex_sample_old(&re->params, tex, texvec, NULL, NULL, 0, &texres, 0, mtex->which_output);	/* NULL = dxt/dyt, 0 = shi->geometry.osatex - not supported */
+			rgbnor= tex_sample_old(&re->params, tex, texvec, NULL, NULL, 0, &texres, shi->shading.thread, mtex->which_output);	/* NULL = dxt/dyt, 0 = shi->geometry.osatex - not supported */
 			
 			/* texture output */
 
@@ -1612,7 +1612,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-void do_halo_tex(Render *re, HaloRen *har, float xn, float yn, float *colf)
+void do_halo_tex(Render *re, HaloRen *har, float xn, float yn, float *colf, int thread)
 {
 	MTex *mtex;
 	TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
@@ -1669,7 +1669,7 @@
 
 	if(mtex->tex->type==TEX_IMAGE) do_2d_mapping(re, mtex, texvec, NULL, NULL, NULL, dxt, dyt, re->params.r.osa);
 	
-	rgb= tex_sample_old(&re->params, mtex->tex, texvec, dxt, dyt, osatex, &texres, 0, mtex->which_output);
+	rgb= tex_sample_old(&re->params, mtex->tex, texvec, dxt, dyt, osatex, &texres, thread, mtex->which_output);
 
 	/* texture output */
 	if(rgb && (mtex->texflag & MTEX_RGBTOINT)) {





More information about the Bf-blender-cvs mailing list