[Bf-blender-cvs] [e160b73] bake-cycles: Cycles-Bake: reverting code I shouldn't need
Dalai Felinto
noreply at git.blender.org
Wed Apr 23 02:46:32 CEST 2014
Commit: e160b7364e162c05290100125508e83783da6163
Author: Dalai Felinto
Date: Tue Jan 14 19:00:08 2014 -0200
https://developer.blender.org/rBe160b7364e162c05290100125508e83783da6163
Cycles-Bake: reverting code I shouldn't need
===================================================================
M intern/cycles/blender/blender_session.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 3de3fb6..dbb40dc 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -46,13 +46,8 @@ BlenderSession::BlenderSession(BL::RenderEngine b_engine_, BL::UserPreferences b
{
/* offline render */
- if (b_render) {
- width = render_resolution_x(b_render);
- height = render_resolution_y(b_render);
- }
- else {
- width = height = 0.0;
- }
+ width = render_resolution_x(b_render);
+ height = render_resolution_y(b_render);
background = true;
last_redraw_time = 0.0;
@@ -192,16 +187,10 @@ void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_)
void BlenderSession::free_session()
{
- try {
- if (sync)
- delete sync;
+ if(sync)
+ delete sync;
- delete session;
- }
- catch (const std::exception &exc)
- {
- printf("Cycles-free session: ERROR: %s\n", exc.what());
- }
+ delete session;
}
static PassType get_pass_type(BL::RenderPass b_pass)
More information about the Bf-blender-cvs
mailing list