[Bf-blender-cvs] [b0b92717bb6] fluid-mantaflow: Mantaflow: Fix solid mode drawing issue for liquid domains

[Sebastián Barschkis]

Commit: b0b92717bb6d9d5ac03c65d3c451fc2dc824f134
Author: Sebastián Barschkis
Date:   Sat Nov 23 00:17:18 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBb0b92717bb6d9d5ac03c65d3c451fc2dc824f134

Mantaflow: Fix solid mode drawing issue for liquid domains

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

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

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

diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 9e6aaa2dc26..4d2698151d5 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -34,6 +34,7 @@
 #include "BKE_particle.h"
 
 #include "DNA_image_types.h"
+#include "DNA_manta_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
@@ -1001,7 +1002,8 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
   if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
       (md = modifiers_findByType(ob, eModifierType_Manta)) &&
       (modifier_isEnabled(scene, md, eModifierMode_Realtime)) &&
-      (((MantaModifierData *)md)->domain != NULL)) {
+      (((MantaModifierData *)md)->domain != NULL) &&
+      (((MantaModifierData *)md)->domain->type == FLUID_DOMAIN_TYPE_GAS)) {
     workbench_volume_cache_populate(vedata, scene, ob, md);
     return; /* Do not draw solid in this case. */
   }
diff --git a/source/blender/draw/engines/workbench/workbench_forward.c b/source/blender/draw/engines/workbench/workbench_forward.c
index 1e144488137..49d27b05e4f 100644
--- a/source/blender/draw/engines/workbench/workbench_forward.c
+++ b/source/blender/draw/engines/workbench/workbench_forward.c
@@ -35,6 +35,7 @@
 #include "BKE_particle.h"
 
 #include "DNA_image_types.h"
+#include "DNA_manta_types.h"
 #include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_node_types.h"
@@ -622,7 +623,8 @@ void workbench_forward_cache_populate(WORKBENCH_Data *vedata, Object *ob)
   if (((ob->base_flag & BASE_FROM_DUPLI) == 0) &&
       (md = modifiers_findByType(ob, eModifierType_Manta)) &&
       (modifier_isEnabled(scene, md, eModifierMode_Realtime)) &&
-      (((MantaModifierData *)md)->domain != NULL)) {
+      (((MantaModifierData *)md)->domain != NULL) &&
+      (((MantaModifierData *)md)->domain->type == FLUID_DOMAIN_TYPE_GAS)) {
     workbench_volume_cache_populate(vedata, scene, ob, md);
     return; /* Do not draw solid in this case. */
   }