[Bf-blender-cvs] [4efd7753685] new-object-types: Merge branch 'master' into new-object-types

[Brecht Van Lommel]

Commit: 4efd77536853d6e314054fb69d4286fd700e2184
Author: Brecht Van Lommel
Date:   Wed Mar 11 15:13:11 2020 +0100
Branches: new-object-types
https://developer.blender.org/rB4efd77536853d6e314054fb69d4286fd700e2184

Merge branch 'master' into new-object-types

===================================================================



===================================================================

diff --cc intern/cycles/blender/blender_volume.cpp
index 6ecc195c98a,4dab60088bb..4b7a8dcfe80
--- a/intern/cycles/blender/blender_volume.cpp
+++ b/intern/cycles/blender/blender_volume.cpp
@@@ -120,15 -81,9 +119,16 @@@ void BlenderSync::sync_volume(BL::Objec
    mesh->clear();
    mesh->used_shaders = used_shaders;
  
-   /* TODO: support disabling volumes in view layer. */
-   if (b_ob.type() == BL::Object::type_VOLUME) {
-     /* Volume object. Create only attributes, bounding mesh will then
-      * be automatically generated later. */
-     sync_volume_object(b_data, b_ob, scene, mesh);
-   }
-   else {
-     /* Smoke domain. */
-     sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
 -  /* Smoke domain. */
+   if (view_layer.use_volumes) {
 -    sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
++    if (b_ob.type() == BL::Object::type_VOLUME) {
++      /* Volume object. Create only attributes, bounding mesh will then
++       * be automatically generated later. */
++      sync_volume_object(b_data, b_ob, scene, mesh);
++    }
++    else {
++      /* Smoke domain. */
++      sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
++    }
    }
  
    /* Tag update. */