[Bf-blender-cvs] [d58e80b4c6c] new-object-types: Fix volume object showing voxels in wireframe mode

[Brecht Van Lommel]

Commit: d58e80b4c6cbdf08fa21a32575251f45a74edfd8
Author: Brecht Van Lommel
Date:   Sun Feb 16 19:38:20 2020 +0100
Branches: new-object-types
https://developer.blender.org/rBd58e80b4c6cbdf08fa21a32575251f45a74edfd8

Fix volume object showing voxels in wireframe mode

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

M	source/blender/draw/engines/workbench/workbench_deferred.c

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

diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index bacbc683382..37acd565906 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -1243,7 +1243,9 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
   }
   else if (ob->type == OB_VOLUME) {
     /* Volume object. */
-    workbench_volume_cache_populate(vedata, scene, ob, NULL);
+    if (!(ob->dt <= OB_WIRE || (wpd->shading.type == OB_WIRE))) {
+      workbench_volume_cache_populate(vedata, scene, ob, NULL);
+    }
   }
 }