[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58237] trunk/blender/intern/cycles: Fix a few issues found by coverity code scan in cycles code, nothing that caused

[Brecht Van Lommel]

Revision: 58237
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58237
Author:   blendix
Date:     2013-07-14 13:19:57 +0000 (Sun, 14 Jul 2013)
Log Message:
-----------
Fix a few issues found by coverity code scan in cycles code, nothing that caused
an actual bug as far as I can tell.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_sync.h
    trunk/blender/intern/cycles/render/film.cpp
    trunk/blender/intern/cycles/render/light.cpp
    trunk/blender/intern/cycles/render/tables.cpp

Modified: trunk/blender/intern/cycles/blender/blender_sync.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.h	2013-07-14 13:18:05 UTC (rev 58236)
+++ trunk/blender/intern/cycles/blender/blender_sync.h	2013-07-14 13:19:57 UTC (rev 58237)
@@ -127,6 +127,7 @@
 		  use_surfaces(true),
 		  use_hair(true),
 		  use_viewport_visibility(false),
+		  use_localview(false),
 		  samples(0), bound_samples(false)
 		{}
 

Modified: trunk/blender/intern/cycles/render/film.cpp
===================================================================
--- trunk/blender/intern/cycles/render/film.cpp	2013-07-14 13:18:05 UTC (rev 58236)
+++ trunk/blender/intern/cycles/render/film.cpp	2013-07-14 13:19:57 UTC (rev 58237)
@@ -359,12 +359,15 @@
 			case PASS_BACKGROUND:
 				kfilm->pass_background = kfilm->pass_stride;
 				kfilm->use_light_pass = 1;
+				break;
 			case PASS_AO:
 				kfilm->pass_ao = kfilm->pass_stride;
 				kfilm->use_light_pass = 1;
+				break;
 			case PASS_SHADOW:
 				kfilm->pass_shadow = kfilm->pass_stride;
 				kfilm->use_light_pass = 1;
+				break;
 			case PASS_NONE:
 				break;
 		}

Modified: trunk/blender/intern/cycles/render/light.cpp
===================================================================
--- trunk/blender/intern/cycles/render/light.cpp	2013-07-14 13:18:05 UTC (rev 58236)
+++ trunk/blender/intern/cycles/render/light.cpp	2013-07-14 13:19:57 UTC (rev 58237)
@@ -53,7 +53,7 @@
 	}
 
 	/* compute on device */
-	float4 *d_output_data = d_output.resize(width*height);
+	d_output.resize(width*height);
 	memset((void*)d_output.data_pointer, 0, d_output.memory_size());
 
 	device->const_copy_to("__data", &dscene->data, sizeof(dscene->data));
@@ -82,7 +82,7 @@
 	device->mem_free(d_input);
 	device->mem_free(d_output);
 
-	d_output_data = reinterpret_cast<float4*>(d_output.data_pointer);
+	float4 *d_output_data = reinterpret_cast<float4*>(d_output.data_pointer);
 
 	pixels.resize(width*height);
 

Modified: trunk/blender/intern/cycles/render/tables.cpp
===================================================================
--- trunk/blender/intern/cycles/render/tables.cpp	2013-07-14 13:18:05 UTC (rev 58236)
+++ trunk/blender/intern/cycles/render/tables.cpp	2013-07-14 13:19:57 UTC (rev 58237)
@@ -99,7 +99,7 @@
 	for(table = lookup_tables.begin(); table != lookup_tables.end(); table++) {
 		if(table->offset == offset) {
 			lookup_tables.erase(table);
-			break;
+			return;
 		}
 	}