[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46311] trunk/blender/intern/cycles/ blender: Fix related to #31317: viewport render layer rendering now uses render visibility
Brecht Van Lommel
brechtvanlommel at pandora.be
Sat May 5 12:17:19 CEST 2012
Revision: 46311
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46311
Author: blendix
Date: 2012-05-05 10:17:18 +0000 (Sat, 05 May 2012)
Log Message:
-----------
Fix related to #31317: viewport render layer rendering now uses render visibility
rather than viewport visibility, is more useful that way.
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/blender_object.cpp
trunk/blender/intern/cycles/blender/blender_sync.cpp
trunk/blender/intern/cycles/blender/blender_sync.h
Modified: trunk/blender/intern/cycles/blender/blender_object.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_object.cpp 2012-05-05 09:30:57 UTC (rev 46310)
+++ trunk/blender/intern/cycles/blender/blender_object.cpp 2012-05-05 10:17:18 UTC (rev 46311)
@@ -286,7 +286,7 @@
BL::Scene::objects_iterator b_ob;
for(b_scene.objects.begin(b_ob); b_ob != b_scene.objects.end(); ++b_ob) {
- bool hide = (b_v3d)? b_ob->hide(): b_ob->hide_render();
+ bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
uint ob_layer = get_layer(b_ob->layers());
if(!hide && (ob_layer & scene_layer)) {
Modified: trunk/blender/intern/cycles/blender/blender_sync.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-05-05 09:30:57 UTC (rev 46310)
+++ trunk/blender/intern/cycles/blender/blender_sync.cpp 2012-05-05 10:17:18 UTC (rev 46311)
@@ -215,6 +215,7 @@
render_layer.holdout_layer = 0;
render_layer.material_override = PointerRNA_NULL;
render_layer.use_background = true;
+ render_layer.use_viewport_visibility = true;
render_layer.samples = 0;
return;
}
@@ -234,6 +235,7 @@
render_layer.layer |= render_layer.holdout_layer;
render_layer.material_override = b_rlay->material_override();
render_layer.use_background = b_rlay->use_sky();
+ render_layer.use_viewport_visibility = false;
render_layer.samples = b_rlay->samples();
}
Modified: trunk/blender/intern/cycles/blender/blender_sync.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_sync.h 2012-05-05 09:30:57 UTC (rev 46310)
+++ trunk/blender/intern/cycles/blender/blender_sync.h 2012-05-05 10:17:18 UTC (rev 46311)
@@ -113,6 +113,7 @@
: scene_layer(0), layer(0), holdout_layer(0),
material_override(PointerRNA_NULL),
use_background(true),
+ use_viewport_visibility(false),
samples(0)
{}
@@ -122,6 +123,7 @@
uint holdout_layer;
BL::Material material_override;
bool use_background;
+ bool use_viewport_visibility;
int samples;
} render_layer;
};
More information about the Bf-blender-cvs
mailing list