Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-03-24 14:52:20 +0400
committerThomas Dinges <blender@dingto.org>2013-03-24 14:52:20 +0400
commitc4ae6f2c3653faed47644713382ae78a49ef074e (patch)
treec1c1b9630b6840eb39368a2fca1168464d4ae34b /intern/cycles/blender/blender_session.cpp
parent0bc791a34fa3464b8df5c91de7ef7696d58468a9 (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.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-rw-r--r--intern/cycles/blender/blender_session.cpp4
1 files changed, 2 insertions, 2 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) ||