[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40285] trunk/blender/source/blender/ render/intern/source/volumetric.c: correction to recent commit, wouldnt have given any troubles but was assigning the 4th component of a float [3].

[Campbell Barton]

Revision: 40285
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40285
Author:   campbellbarton
Date:     2011-09-17 07:28:19 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
correction to recent commit, wouldnt have given any troubles but was assigning the 4th component of a float[3].

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/volumetric.c

Modified: trunk/blender/source/blender/render/intern/source/volumetric.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/volumetric.c	2011-09-17 07:14:39 UTC (rev 40284)
+++ trunk/blender/source/blender/render/intern/source/volumetric.c	2011-09-17 07:28:19 UTC (rev 40285)
@@ -186,7 +186,7 @@
 	col_r[3] = shr_new.alpha;
 }
 
-static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, const float co[3], float col[3])
+static void vol_trace_behind(ShadeInput *shi, VlakRen *vlr, const float co[3], float col_r[4])
 {
 	Isect isect;
 	
@@ -204,10 +204,10 @@
 	
 	/* check to see if there's anything behind the volume, otherwise shade the sky */
 	if(RE_rayobject_raycast(R.raytree, &isect)) {
-		shade_intersection(shi, col, &isect);
+		shade_intersection(shi, col_r, &isect);
 	} else {
-		shadeSkyView(col, co, shi->view, NULL, shi->thread);
-		shadeSunView(col, shi->view);
+		shadeSkyView(col_r, co, shi->view, NULL, shi->thread);
+		shadeSunView(col_r, shi->view);
 	} 
 }
 
@@ -699,7 +699,7 @@
 		} else {
 			/* we're tracing through the volume between the camera 
 			 * and a solid surface, so use that pre-shaded radiance */
-			QUATCOPY(col, shr->combined);
+			copy_v4_v4(col, shr->combined);
 		}
 		
 		/* shade volume from 'camera' to 1st hit point */