[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55547] trunk/blender: Fix for [#34747] Rendering invisible tiles

Thomas Dinges blender at dingto.org
Sun Mar 24 11:52:21 CET 2013


Revision: 55547
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55547
Author:   dingto
Date:     2013-03-24 10:52:20 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
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. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_session.cpp
    trunk/blender/source/blender/makesdna/DNA_scene_types.h

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-03-24 06:23:15 UTC (rev 55546)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-03-24 10:52:20 UTC (rev 55547)
@@ -126,8 +126,8 @@
 	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) ||

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2013-03-24 06:23:15 UTC (rev 55546)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2013-03-24 10:52:20 UTC (rev 55547)
@@ -388,7 +388,9 @@
 
 	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;
 




More information about the Bf-blender-cvs mailing list