Commit: 82c2daa2484a2526260aa2542c23b8018aa2f0be
Author: Sebastián Barschkis
Date: Sat Aug 15 13:34:27 2015 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB82c2daa2484a2526260aa2542c23b8018aa2f0be
Merge branch 'master' into soc-2014-fluid
Conflicts:
CMakeLists.txt
extern/CMakeLists.txt
extern/SConscript
intern/ghost/intern/GHOST_WindowCocoa.mm
source/creator/CMakeLists.txt
===================================================================
===================================================================
diff --cc CMakeLists.txt
index 6b879b4,5b68ef1..27d96da
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -221,9 -226,16 +226,17 @@@ mark_as_advanced(WITH_SYSTEM_BULLET
option(WITH_GAMEENGINE "Enable Game Engine" ${_init_GAMEENGINE})
option(WITH_PLAYER "Build Player" OFF)
option(WITH_OPENCOLORIO "Enable OpenColorIO color management"
${_init_OPENCOLORIO})
- option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
+option(WITH_MOD_MANTA "Enable Mantaflow Framework" ON)
+ # Compositor
+ option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
+ option(WITH_COMPOSITOR_WERROR "Treat warnings as errors in compositor code"
OFF)
+ mark_as_advanced(WITH_COMPOSITOR_WERROR)
+
+ option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision"
_init_OPENSUBDIV)
+ option(WITH_SUBSURF_WERROR "Treat warnings as errors in subsurf code" OFF)
+ mark_as_advanced(WITH_COMPOSITOR_WERROR)
+
# GHOST Windowing Library Options
option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF)
mark_as_advanced(WITH_GHOST_DEBUG)
@@@ -2564,8 -2617,19 +2650,19 @@@ if(CMAKE_COMPILER_IS_GNUCC
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_LOGICAL_OP
-Wlogical-op)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_INIT_SELF
-Winit-self) # needs -Wuninitialized
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_INCLUDE_DIRS
-Wmissing-include-dirs)
-- ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO
-Wno-div-by-zero)
-
++ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_DIV_BY_ZERO
-Wno-div-by-zero)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_TYPE_LIMITS
-Wtype-limits)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ERROR_RETURN_TYPE
-Werror=return-type)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS
CXX_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS
CXX_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION
-Werror=implicit-function-declaration)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_CHAR_SUBSCRIPTS
-Wno-char-subscripts)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_UNKNOWN_PRAGMAS
-Wno-unknown-pragmas)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_POINTER_ARITH
-Wpointer-arith)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_PARAMETER
-Wunused-parameter)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_WRITE_STRINGS
-Wwrite-strings)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEF -Wundef)
+ ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_FORMAT_SIGN
-Wformat-signedness)
+
# gcc 4.2 gives annoying warnings on every file with this
if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "4.3")
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNINITIALIZED
-Wuninitialized)
diff --cc extern/CMakeLists.txt
index 0caa5e2,93f57b0..2803fd2
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@@ -29,8 -29,11 +29,12 @@@ remove_strict_flags(
add_subdirectory(rangetree)
add_subdirectory(wcwidth)
add_subdirectory(libmv)
+#add_subdirectory(manta_pp)
+ add_subdirectory(Eigen3)
+
+ if(WITH_OPENNL)
+ add_subdirectory(colamd)
+ endif()
if(WITH_BULLET)
if(NOT WITH_SYSTEM_BULLET)
diff --cc extern/SConscript
index b02e705,484c0e9..957a529
--- a/extern/SConscript
+++ b/extern/SConscript
@@@ -11,7 -11,7 +11,8 @@@ SConscript(['colamd/SConscript']
SConscript(['rangetree/SConscript'])
SConscript(['wcwidth/SConscript'])
SConscript(['libmv/SConscript'])
+#SConscript(['manta_pp/SConscript'])
+ SConscript(['Eigen3/SConscript'])
if env['WITH_BF_GAMEENGINE']:
SConscript(['recastnavigation/SConscript'])
diff --cc release/datafiles/locale
index c651e63,c651e63..de6c83e
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
++Subproject commit de6c83e12e75ffaac90eddbd3cb7451b57c2e0ce
diff --cc release/scripts/addons
index e716a35,3fc5b82..94c9c4e
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e716a3503d0e4ece893d42e394e684ebce90ea4e
-Subproject commit 3fc5b82c6bdba2f9c954fbf497621b9bb794a1bc
++Subproject commit 94c9c4ee3370d1feb42fc978a1f0d2db07cb9431
diff --cc release/scripts/addons_contrib
index d9b4c8f,cf842d8..e31cec5
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit d9b4c8f5ddc958a66cd53f630d5569da426efb4f
-Subproject commit cf842d8bb7b0033ca4fa99f7ebedcbd3810fd274
++Subproject commit e31cec5bf243f00441c7dad7a775ec4722f829d3
diff --cc source/blender/makesdna/DNA_smoke_types.h
index f3a88f9,5e01167..82fd6f8
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@@ -37,19 -37,14 +37,17 @@@ enum
MOD_SMOKE_HIGHRES = (1 << 1), /* enable high resolution */
MOD_SMOKE_DISSOLVE = (1 << 2), /* let smoke dissolve */
MOD_SMOKE_DISSOLVE_LOG = (1 << 3), /* using 1/x for dissolve */
+ MOD_SMOKE_USE_MANTA = (1 << 4),
+ #ifdef DNA_DEPRECATED
MOD_SMOKE_HIGH_SMOOTH = (1 << 5), /* -- Deprecated -- */
+ #endif
MOD_SMOKE_FILE_LOAD = (1 << 6), /* flag for file load */
MOD_SMOKE_ADAPTIVE_DOMAIN = (1 << 7),
+ MOD_SMOKE_NOISE_CLAMP = (1 << 8), /*for mantaflow*/
+ MOD_SMOKE_MANTA_USE_LIQUID = (1 << 9),/*enable liquid simulation*/
};
- #if (DNA_DEPRECATED_GCC_POISON == 1)
- #pragma GCC poison MOD_SMOKE_HIGH_SMOOTH
- #endif
-
/* noise */
#define MOD_SMOKE_NOISEWAVE (1<<0)
#define MOD_SMOKE_NOISEFFT (1<<1)
diff --cc source/blender/makesrna/intern/SConscript
index e3dbab0,4cb2a58..bf95819
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@@ -59,10 -60,8 +60,9 @@@ incs =
'#/intern/guardedalloc',
env['BF_GLEW_INC'],
'#/intern/glew-mx',
- '#/intern/audaspace/intern',
'#/intern/cycles/blender',
'#/intern/smoke/extern',
+ '#/source//blender/python/manta_pp',
'../../blenfont',
'../../blenkernel',
'../../blenlib',
diff --cc source/blender/python/SConscript
index 3b46b3f,eeca09e..d14f7f1
--- a/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@@ -78,15 -78,10 +78,16 @@@ defs = [
sources = env.Glob('mathutils/*.c')
env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources),
includes = Split(incs), defines = defs, libtype = ['core','player'], priority =
[362,165])
+# manta
+defs = []
+
+sources = env.Glob('manta_pp/source/*')
+env.BlenderLib( libname = 'bf_python_manta', sources = Split(sources),
includes = Split(incs), defines = defs, libtype = ['core','player'])
+
# bpy
- defs = env['BF_GL_DEFINITIONS']
+ defs = []
+ defs += env['BF_GL_DEFINITIONS']
if is_debug:
defs.append('_DEBUG')
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
