Commit: c65d58a3846d8b4b08c170d0461253a66f14dc26
Author: Sebastián Barschkis
Date: Tue May 24 23:10:59 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBc65d58a3846d8b4b08c170d0461253a66f14dc26
Merge branch 'master' into fluid-mantaflow
===================================================================
===================================================================
diff --cc build_files/cmake/macros.cmake
index a560b6a,47fc86c..f6d446f
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -605,8 -578,8 +578,9 @@@ function(SETUP_BLENDER_SORTED_LIBS
ge_phys_dummy
ge_phys_bullet
bf_intern_smoke
+# bf_intern_mantaflow # configured separately in
source/creator/CMakeLists.txt
extern_lzma
+ extern_curve_fit_nd
ge_logic_ketsji
extern_recastnavigation
ge_logic
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
