[Bf-blender-cvs] [512f61ff7af] temp-cmake-without-sorted-libs: CMake: fix building without fluid sim and smoke

Brecht Van Lommel noreply at git.blender.org
Mon Apr 15 20:37:11 CEST 2019


Commit: 512f61ff7affcef7410b69bd52ce974b105ae934
Author: Brecht Van Lommel
Date:   Mon Apr 15 20:19:46 2019 +0200
Branches: temp-cmake-without-sorted-libs
https://developer.blender.org/rB512f61ff7affcef7410b69bd52ce974b105ae934

CMake: fix building without fluid sim and smoke

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

M	source/blender/blenkernel/intern/smoke.c
M	source/blender/editors/physics/physics_fluid.c

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 82acc272c6b..122bb5a19c5 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -87,10 +87,10 @@
 #  include "PIL_time.h"
 #endif
 
-#include "smoke_API.h"
-
 #ifdef WITH_SMOKE
 
+#include "smoke_API.h"
+
 #include "BLI_task.h"
 #include "BLI_kdtree.h"
 #include "BLI_voxel.h"
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 9192d1c2fe9..d3b57a09a9e 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -45,8 +45,6 @@
 
 #include "DEG_depsgraph.h"
 
-#include "LBM_fluidsim.h"
-
 #include "ED_screen.h"
 
 #include "WM_types.h"
@@ -57,6 +55,8 @@
 /* enable/disable overall compilation */
 #ifdef WITH_MOD_FLUID
 
+#include "LBM_fluidsim.h"
+
 #include "BLI_blenlib.h"
 #include "BLI_path_util.h"
 #include "BLI_math.h"



More information about the Bf-blender-cvs mailing list