diff options
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 1 | ||||
| -rw-r--r-- | intern/cycles/render/film.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/render/light.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/tables.cpp | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index ed1f2b9d70f..da86bafa936 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -127,6 +127,7 @@ private: use_surfaces(true), use_hair(true), use_viewport_visibility(false), + use_localview(false), samples(0), bound_samples(false) {} diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 43aef755ba3..2a16b7b6c21 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -359,12 +359,15 @@ void Film::device_update(Device *device, DeviceScene *dscene, Scene *scene) 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; } diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 276647e6b2f..8b831c25d28 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -53,7 +53,7 @@ static void shade_background_pixels(Device *device, DeviceScene *dscene, int res } /* 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 @@ static void shade_background_pixels(Device *device, DeviceScene *dscene, int res 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); diff --git a/intern/cycles/render/tables.cpp b/intern/cycles/render/tables.cpp index c7c86f68960..032fef7516e 100644 --- a/intern/cycles/render/tables.cpp +++ b/intern/cycles/render/tables.cpp @@ -99,7 +99,7 @@ void LookupTables::remove_table(size_t offset) for(table = lookup_tables.begin(); table != lookup_tables.end(); table++) { if(table->offset == offset) { lookup_tables.erase(table); - break; + return; } } |