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:
authorBrecht Van Lommel <brecht@blender.org>2020-03-11 13:22:13 +0300
committerBrecht Van Lommel <brecht@blender.org>2020-03-11 13:25:57 +0300
commit796683db8edb98adf2165fed458d08454cb7c977 (patch)
tree3d209533c3915cfbd59d498e3000b097f56017a9 /intern/cycles/blender/blender_volume.cpp
parentb70a13fb667f2121047673ea914fe84385f0d9c1 (diff)
Cycles: add view layer setting to exclude volumes, like hair and surfaces
Diffstat (limited to 'intern/cycles/blender/blender_volume.cpp')
-rw-r--r--intern/cycles/blender/blender_volume.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_volume.cpp b/intern/cycles/blender/blender_volume.cpp
index 47259d4945c..4dab60088bb 100644
--- a/intern/cycles/blender/blender_volume.cpp
+++ b/intern/cycles/blender/blender_volume.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011-2013 Blender Foundation
*
@@ -83,7 +82,9 @@ void BlenderSync::sync_volume(BL::Object &b_ob, Mesh *mesh, const vector<Shader
mesh->used_shaders = used_shaders;
/* Smoke domain. */
- sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
+ if (view_layer.use_volumes) {
+ sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
+ }
/* Tag update. */
bool rebuild = (old_has_voxel_attributes != mesh->has_voxel_attributes());