[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41526] branches/cycles/intern/cycles/ blender: Cycles: always use static bvh for non-viewport render.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Nov 4 16:46:15 CET 2011
Revision: 41526
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41526
Author: blendix
Date: 2011-11-04 15:46:15 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Cycles: always use static bvh for non-viewport render.
Modified Paths:
--------------
branches/cycles/intern/cycles/blender/addon/properties.py
branches/cycles/intern/cycles/blender/blender_session.cpp
branches/cycles/intern/cycles/blender/blender_sync.cpp
branches/cycles/intern/cycles/blender/blender_sync.h
Modified: branches/cycles/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/properties.py 2011-11-04 15:21:34 UTC (rev 41525)
+++ branches/cycles/intern/cycles/blender/addon/properties.py 2011-11-04 15:46:15 UTC (rev 41526)
@@ -92,7 +92,7 @@
cls.debug_text_timeout = FloatProperty(name="Text timeout", description="",
default=1.0, min=0.01, max=10.0)
- cls.debug_bvh_type = EnumProperty(name="BVH Type", description="Choose between faster updates, or faster render",
+ cls.debug_bvh_type = EnumProperty(name="Viewport BVH Type", description="Choose between faster updates, or faster render",
items=enums.bvh_types, default="DYNAMIC_BVH")
cls.debug_use_spatial_splits = BoolProperty(name="Use Spatial Splits", description="Use BVH spatial splits: longer builder time, faster render",
default=False)
Modified: branches/cycles/intern/cycles/blender/blender_session.cpp
===================================================================
--- branches/cycles/intern/cycles/blender/blender_session.cpp 2011-11-04 15:21:34 UTC (rev 41525)
+++ branches/cycles/intern/cycles/blender/blender_session.cpp 2011-11-04 15:46:15 UTC (rev 41526)
@@ -73,7 +73,7 @@
void BlenderSession::create_session()
{
- SceneParams scene_params = BlenderSync::get_scene_params(b_scene);
+ SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
SessionParams session_params = BlenderSync::get_session_params(b_scene, background);
/* reset status/progress */
@@ -152,7 +152,7 @@
void BlenderSession::synchronize()
{
/* on session/scene parameter changes, we recreate session entirely */
- SceneParams scene_params = BlenderSync::get_scene_params(b_scene);
+ SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
SessionParams session_params = BlenderSync::get_session_params(b_scene, background);
if(session->params.modified(session_params) ||
Modified: branches/cycles/intern/cycles/blender/blender_sync.cpp
===================================================================
--- branches/cycles/intern/cycles/blender/blender_sync.cpp 2011-11-04 15:21:34 UTC (rev 41525)
+++ branches/cycles/intern/cycles/blender/blender_sync.cpp 2011-11-04 15:46:15 UTC (rev 41526)
@@ -210,7 +210,7 @@
/* Scene Parameters */
-SceneParams BlenderSync::get_scene_params(BL::Scene b_scene)
+SceneParams BlenderSync::get_scene_params(BL::Scene b_scene, bool background)
{
SceneParams params;
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
@@ -221,7 +221,11 @@
else if(shadingsystem == 1)
params.shadingsystem = SceneParams::OSL;
- params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, "debug_bvh_type");
+ if(background)
+ params.bvh_type = SceneParams::BVH_STATIC;
+ else
+ params.bvh_type = (SceneParams::BVHType)RNA_enum_get(&cscene, "debug_bvh_type");
+
params.use_bvh_spatial_split = RNA_boolean_get(&cscene, "debug_use_spatial_splits");
return params;
Modified: branches/cycles/intern/cycles/blender/blender_sync.h
===================================================================
--- branches/cycles/intern/cycles/blender/blender_sync.h 2011-11-04 15:21:34 UTC (rev 41525)
+++ branches/cycles/intern/cycles/blender/blender_sync.h 2011-11-04 15:46:15 UTC (rev 41526)
@@ -59,7 +59,7 @@
void sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height);
/* get parameters */
- static SceneParams get_scene_params(BL::Scene b_scene);
+ static SceneParams get_scene_params(BL::Scene b_scene, bool background);
static SessionParams get_session_params(BL::Scene b_scene, bool background);
static bool get_session_pause(BL::Scene b_scene, bool background);
More information about the Bf-blender-cvs
mailing list