[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54492] trunk/blender/intern/cycles: Fix some (quite harmless) use of uninitialized memory reported by valgrind .

[Brecht Van Lommel]

Revision: 54492
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54492
Author:   blendix
Date:     2013-02-12 13:48:04 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
Fix some (quite harmless) use of uninitialized memory reported by valgrind.

Modified Paths:
--------------
    trunk/blender/intern/cycles/bvh/bvh.cpp
    trunk/blender/intern/cycles/render/buffers.cpp

Modified: trunk/blender/intern/cycles/bvh/bvh.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh.cpp	2013-02-12 13:06:52 UTC (rev 54491)
+++ trunk/blender/intern/cycles/bvh/bvh.cpp	2013-02-12 13:48:04 UTC (rev 54492)
@@ -340,6 +340,10 @@
 			Object *ob = objects[tob];
 			pack.prim_visibility[i] = ob->visibility;
 		}
+		else {
+			memset(&pack.tri_woop[i * nsize], 0, sizeof(float4)*3);
+			pack.prim_visibility[i] = 0;
+		}
 	}
 }
 
@@ -476,7 +480,7 @@
 		}
 
 		/* merge nodes */
-		if( bvh->pack.nodes.size()) {
+		if(bvh->pack.nodes.size()) {
 			size_t nsize_bbox = (use_qbvh)? nsize-2: nsize-1;
 			int4 *bvh_nodes = &bvh->pack.nodes[0];
 			size_t bvh_nodes_size = bvh->pack.nodes.size(); 

Modified: trunk/blender/intern/cycles/render/buffers.cpp
===================================================================
--- trunk/blender/intern/cycles/render/buffers.cpp	2013-02-12 13:06:52 UTC (rev 54491)
+++ trunk/blender/intern/cycles/render/buffers.cpp	2013-02-12 13:48:04 UTC (rev 54492)
@@ -83,6 +83,7 @@
 	w = 0;
 	h = 0;
 
+	sample = 0;
 	start_sample = 0;
 	num_samples = 0;
 	resolution = 0;