[Bf-blender-cvs] [10eb711e165] blender-v2.82-release: Fix: Building without WITH_MOD_FLUID

[Ray Molenkamp]

Commit: 10eb711e1657a7f49e30a44bae9177ec3590c6c0
Author: Ray Molenkamp
Date:   Mon Jan 27 10:46:55 2020 -0700
Branches: blender-v2.82-release
https://developer.blender.org/rB10eb711e1657a7f49e30a44bae9177ec3590c6c0

Fix: Building without WITH_MOD_FLUID

When MOD_FLUID was off and WITH_CYCLES was on there was a build error.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D6542

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

M	intern/cycles/blender/CMakeLists.txt
M	intern/cycles/blender/blender_session.cpp

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

diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
index b6ecab28555..0888eeb78bb 100644
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -82,6 +82,10 @@ if(WITH_CYCLES_NETWORK)
   add_definitions(-DWITH_NETWORK)
 endif()
 
+if(WITH_MOD_FLUID)
+  add_definitions(-DWITH_FLUID)
+endif()
+
 blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # avoid link failure with clang 3.4 debug
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index 924807350f9..e2dea24fdd1 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -1345,7 +1345,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
     if (!b_domain) {
       return false;
     }
-
+#if WITH_FLUID
     int3 resolution = get_int3(b_domain.domain_resolution());
     int length, amplify = (b_domain.use_noise()) ? b_domain.noise_scale() : 1;
 
@@ -1411,7 +1411,7 @@ bool BlenderSession::builtin_image_float_pixels(const string &builtin_name,
       pixels[0] = 0.0f;
       return false;
     }
-
+#endif
     fprintf(stderr, "Cycles error: unexpected smoke volume resolution, skipping\n");
   }
   else {