[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59332] trunk/blender/intern/cycles/kernel : Fix compiler warning due to undefined BVH_FUNCTION_FEATURES with patch by Campbell ,

[Brecht Van Lommel]

Revision: 59332
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59332
Author:   blendix
Date:     2013-08-20 18:25:59 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
Fix compiler warning due to undefined BVH_FUNCTION_FEATURES with patch by Campbell,
and a coverity warning about use of uninitialized variables with OSL.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-08-20 17:38:29 UTC (rev 59331)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-08-20 18:25:59 UTC (rev 59332)
@@ -782,6 +782,7 @@
 
 #if defined(__SUBSURFACE__)
 #define BVH_FUNCTION_NAME bvh_intersect_subsurface
+#define BVH_FUNCTION_FEATURES 0
 #include "kernel_bvh_subsurface.h"
 #endif
 

Modified: trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2013-08-20 17:38:29 UTC (rev 59331)
+++ trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp	2013-08-20 18:25:59 UTC (rev 59332)
@@ -189,6 +189,8 @@
 
 					sc.sample_weight = sample_weight;
 					sc.type = CLOSURE_EMISSION_ID;
+					sc.data0 = 0.0f;
+					sc.data1 = 0.0f;
 					sc.prim = NULL;
 
 					/* flag */
@@ -204,6 +206,8 @@
 
 					sc.sample_weight = sample_weight;
 					sc.type = CLOSURE_AMBIENT_OCCLUSION_ID;
+					sc.data0 = 0.0f;
+					sc.data1 = 0.0f;
 					sc.prim = NULL;
 
 					if(sd->num_closure < MAX_CLOSURE) {
@@ -215,6 +219,8 @@
 				case OSL::ClosurePrimitive::Holdout: {
 					sc.sample_weight = 0.0f;
 					sc.type = CLOSURE_HOLDOUT_ID;
+					sc.data0 = 0.0f;
+					sc.data1 = 0.0f;
 					sc.prim = NULL;
 
 					if(sd->num_closure < MAX_CLOSURE) {