diff options
author | Thomas Dinges <blender@dingto.org> | 2013-03-24 14:52:20 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2013-03-24 14:52:20 +0400 |
commit | c4ae6f2c3653faed47644713382ae78a49ef074e (patch) | |
tree | c1c1b9630b6840eb39368a2fca1168464d4ae34b | |
parent | 0bc791a34fa3464b8df5c91de7ef7696d58468a9 (diff) |
Fix for [#34747] Rendering invisible tiles
* reset_session() was not taking render percentage into account in case persistent_data was enabled.
* also deprecate old "maximsize" DNA variable.
-rw-r--r-- | intern/cycles/blender/blender_session.cpp | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp index 8eec383850e..d10fb99450d 100644 --- a/intern/cycles/blender/blender_session.cpp +++ b/intern/cycles/blender/blender_session.cpp @@ -126,8 +126,8 @@ void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_) SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background); SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background); - width = b_render.resolution_x(); - height = b_render.resolution_y(); + width = (int)(b_render.resolution_x()*b_render.resolution_percentage()/100); + height = (int)(b_render.resolution_y()*b_render.resolution_percentage()/100); if(scene->params.modified(scene_params) || session->params.modified(session_params) || diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index cd1acb53029..2b78a76b9fa 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -388,7 +388,9 @@ typedef struct RenderData { short filtertype; /* filter is box, tent, gauss, mitch, etc */ - short size, maximsize; /* size in %, max in Kb */ + short size; /* size in % */ + + short maximsize DNA_DEPRECATED; /* max in Kb */ short pad6; |