[Bf-blender-cvs] [46d4cb8] openvdb: Move source/blender/openvdb folder to intern/openvdb

Kévin Dietrich noreply at git.blender.org
Fri Jun 5 14:07:40 CEST 2015


Commit: 46d4cb86b64c3fb949cf4ae71e3c9e6b87cbb888
Author: Kévin Dietrich
Date:   Sat May 23 03:36:36 2015 +0200
Branches: openvdb
https://developer.blender.org/rB46d4cb86b64c3fb949cf4ae71e3c9e6b87cbb888

Move source/blender/openvdb folder to intern/openvdb

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

M	build_files/cmake/macros.cmake
M	intern/CMakeLists.txt
M	intern/SConscript
A	intern/openvdb/CMakeLists.txt
A	intern/openvdb/SConscript
A	intern/openvdb/intern/openvdb_reader.cpp
A	intern/openvdb/intern/openvdb_reader.h
A	intern/openvdb/intern/openvdb_smoke_export.cpp
A	intern/openvdb/intern/openvdb_writer.cpp
A	intern/openvdb/intern/openvdb_writer.h
A	intern/openvdb/openvdb_capi.cpp
A	intern/openvdb/openvdb_capi.h
A	intern/openvdb/openvdb_intern.h
A	intern/openvdb/openvdb_util.cpp
A	intern/openvdb/openvdb_util.h
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/CMakeLists.txt
M	source/blender/SConscript
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/SConscript
M	source/blender/editors/object/CMakeLists.txt
M	source/blender/editors/object/SConscript
M	source/blender/nodes/CMakeLists.txt
M	source/blender/nodes/SConscript
D	source/blender/openvdb/CMakeLists.txt
D	source/blender/openvdb/SConscript
D	source/blender/openvdb/intern/openvdb_reader.cpp
D	source/blender/openvdb/intern/openvdb_reader.h
D	source/blender/openvdb/intern/openvdb_smoke_export.cpp
D	source/blender/openvdb/intern/openvdb_writer.cpp
D	source/blender/openvdb/intern/openvdb_writer.h
D	source/blender/openvdb/openvdb_capi.cpp
D	source/blender/openvdb/openvdb_capi.h
D	source/blender/openvdb/openvdb_intern.h
D	source/blender/openvdb/openvdb_util.cpp
D	source/blender/openvdb/openvdb_util.h
M	source/blender/python/SConscript
M	source/blender/python/intern/CMakeLists.txt
M	source/blenderplayer/CMakeLists.txt

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

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 1691336..74b26f6 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -663,7 +663,7 @@ macro(SETUP_BLENDER_SORTED_LIBS)
 	endif()
 
 	if(WITH_OPENVDB)
-		list(APPEND BLENDER_SORTED_LIBS bf_openvdb)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb)
 	endif()
 
 	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 74048c2..cf7f913 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -82,3 +82,7 @@ if(WIN32)
 	add_subdirectory(utfconv)
 endif()
 
+if(WITH_OPENVDB)
+	add_subdirectory(openvdb)
+endif()
+
diff --git a/intern/SConscript b/intern/SConscript
index c0dafe3..d416cab 100644
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -63,3 +63,5 @@ if env['WITH_BF_BULLET']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
     SConscript(['utfconv/SConscript'])
 
+if env['WITH_BF_OPENVDB']:
+    SConscript (['openvdb/SConscript'])
diff --git a/source/blender/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt
similarity index 86%
rename from source/blender/openvdb/CMakeLists.txt
rename to intern/openvdb/CMakeLists.txt
index 582db8e..e072a0e 100644
--- a/source/blender/openvdb/CMakeLists.txt
+++ b/intern/openvdb/CMakeLists.txt
@@ -26,12 +26,11 @@
 set(INC
     .
     intern
-    ../blenkernel
-    ../blenlib
-    ../makesdna
-    ../makesrna
-    ../../../intern/guardedalloc
-    ../../../intern/smoke/intern
+    ../guardedalloc
+    ../../source/blender/blenkernel
+    ../../source/blender/blenlib
+    ../../source/blender/makesdna
+    ../../source/blender/makesrna
 )
 
 set(INC_SYS
@@ -64,4 +63,4 @@ if(WITH_OPENVDB)
     )
 endif()
 
-blender_add_lib(bf_openvdb "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_openvdb "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/openvdb/SConscript b/intern/openvdb/SConscript
similarity index 80%
rename from source/blender/openvdb/SConscript
rename to intern/openvdb/SConscript
index 4dcb3a8..5435dcc 100644
--- a/source/blender/openvdb/SConscript
+++ b/intern/openvdb/SConscript
@@ -33,12 +33,11 @@ defs = []
 incs = [
     '.',
     'intern',
-    '#/intern/guardedalloc',
-    '#/intern/smoke/intern',
-    '../blenkernel',
-    '../blenlib',
-    '../makesdna',
-    '../makesrna',
+    '../guardedalloc',
+    '../../source/blender/blenkernel',
+    '../../source/blender/blenlib',
+    '../../source/blender/makesdna',
+    '../../source/blender/makesrna',
     env['BF_OPENVDB_INC']
 ]
 
@@ -49,4 +48,4 @@ if env['WITH_BF_OPENVDB']:
     defs.append('DDF_DEBUG=0')
     sources = env.Glob('*.cpp') + env.Glob('intern/*.cpp')
 
-env.BlenderLib ( libname = 'bf_openvdb', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [364] )
+env.BlenderLib ( libname = 'bf_intern_openvdb', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [364] )
diff --git a/source/blender/openvdb/intern/openvdb_reader.cpp b/intern/openvdb/intern/openvdb_reader.cpp
similarity index 100%
rename from source/blender/openvdb/intern/openvdb_reader.cpp
rename to intern/openvdb/intern/openvdb_reader.cpp
diff --git a/source/blender/openvdb/intern/openvdb_reader.h b/intern/openvdb/intern/openvdb_reader.h
similarity index 100%
rename from source/blender/openvdb/intern/openvdb_reader.h
rename to intern/openvdb/intern/openvdb_reader.h
diff --git a/source/blender/openvdb/intern/openvdb_smoke_export.cpp b/intern/openvdb/intern/openvdb_smoke_export.cpp
similarity index 99%
rename from source/blender/openvdb/intern/openvdb_smoke_export.cpp
rename to intern/openvdb/intern/openvdb_smoke_export.cpp
index 38ef7af..132f052 100644
--- a/source/blender/openvdb/intern/openvdb_smoke_export.cpp
+++ b/intern/openvdb/intern/openvdb_smoke_export.cpp
@@ -33,9 +33,6 @@
 #include "openvdb_intern.h"
 #include "openvdb_writer.h"
 
-#include "FLUID_3D.h"
-#include "WTURBULENCE.h"
-
 using namespace openvdb;
 
 namespace internal {
diff --git a/source/blender/openvdb/intern/openvdb_writer.cpp b/intern/openvdb/intern/openvdb_writer.cpp
similarity index 100%
rename from source/blender/openvdb/intern/openvdb_writer.cpp
rename to intern/openvdb/intern/openvdb_writer.cpp
diff --git a/source/blender/openvdb/intern/openvdb_writer.h b/intern/openvdb/intern/openvdb_writer.h
similarity index 100%
rename from source/blender/openvdb/intern/openvdb_writer.h
rename to intern/openvdb/intern/openvdb_writer.h
diff --git a/source/blender/openvdb/openvdb_capi.cpp b/intern/openvdb/openvdb_capi.cpp
similarity index 100%
rename from source/blender/openvdb/openvdb_capi.cpp
rename to intern/openvdb/openvdb_capi.cpp
diff --git a/source/blender/openvdb/openvdb_capi.h b/intern/openvdb/openvdb_capi.h
similarity index 100%
rename from source/blender/openvdb/openvdb_capi.h
rename to intern/openvdb/openvdb_capi.h
diff --git a/source/blender/openvdb/openvdb_intern.h b/intern/openvdb/openvdb_intern.h
similarity index 100%
rename from source/blender/openvdb/openvdb_intern.h
rename to intern/openvdb/openvdb_intern.h
diff --git a/source/blender/openvdb/openvdb_util.cpp b/intern/openvdb/openvdb_util.cpp
similarity index 100%
rename from source/blender/openvdb/openvdb_util.cpp
rename to intern/openvdb/openvdb_util.cpp
diff --git a/source/blender/openvdb/openvdb_util.h b/intern/openvdb/openvdb_util.h
similarity index 100%
rename from source/blender/openvdb/openvdb_util.h
rename to intern/openvdb/openvdb_util.h
diff --git a/release/scripts/addons b/release/scripts/addons
index 234760a..04c5015 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 234760a9400aabcd765576c8f56693e551867cb3
+Subproject commit 04c5015d0349bdf7f274a3893664fd5e523d22c7
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f295035..3537c4a 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f295035413682845f959d45a7a6256bf31624f8b
+Subproject commit 3537c4ac7db88ecfe1c307268cd4eb0548ad32e2
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index ca98860..19d4f20 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -151,7 +151,3 @@ endif()
 if(WITH_FREESTYLE)
 	add_subdirectory(freestyle)
 endif()
-
-if(WITH_OPENVDB)
-	add_subdirectory(openvdb)
-endif()
diff --git a/source/blender/SConscript b/source/blender/SConscript
index 5fa583e..e987b6b 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -74,6 +74,3 @@ if env['WITH_BF_COMPOSITOR']:
 
 if env['WITH_BF_FREESTYLE']:
     SConscript (['freestyle/SConscript'])
-
-if env['WITH_BF_OPENVDB']:
-    SConscript (['openvdb/SConscript'])
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index d4b364e..5b9bfd1 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -37,7 +37,6 @@ set(INC
 	../bmesh
 	../modifiers
 	../nodes
-	../openvdb
 	../physics
 	../render/extern/include
 	../../../intern/ghost
@@ -46,6 +45,7 @@ set(INC
 	../../../intern/iksolver/extern
 	../../../intern/memutil
 	../../../intern/mikktspace
+	../../../intern/openvdb
 	../../../intern/raskter
 	../../../intern/smoke/extern
 	../../../intern/atomic
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index e89e072..b8ce537 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -66,7 +66,6 @@ incs = [
     '../makesrna',
     '../modifiers',
     '../nodes',
-    '../openvdb',
     '../physics',
     '../render/extern/include',
     '../windowmanager',
@@ -171,6 +170,7 @@ if env['WITH_BF_FREESTYLE']:
 
 if env['WITH_BF_OPENVDB']:
     defs.append('WITH_OPENVDB')
+    incs += ' #/intern/openvdb'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs += ' ' + env['BF_PTHREADS_INC']
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 27a7a10..1864bdf 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -29,13 +29,13 @@ set(INC
 	../../imbuf
 	../../makesdna
 	../../makesrna
-	../../openvdb
 	../../python
 	../../render/extern/include
 	../../windowmanager
 	../../../../intern/guardedalloc
 	../../../../intern/glew-mx
 	../../../../intern/smoke/extern
+	../../../../intern/openvdb
 )
 
 set(INC_SYS
diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript
index db30fae..852a854 100644
--- a/source/blender/editors/object/SConscript
+++ b/source/blender/editors/object/SConscript
@@ -63,4 +63,8 @@ if env['WITH_BF_GAMEENGINE']:
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
 
+if env['WITH_BF_OPENVDB']:
+    defs.append('WITH_OPENVDB')
+    incs += ' #/intern/openvdb'
+
 env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index b5ba2e9..c1cd19d 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -36,10 +36,10 @@ set(INC
 	../imbuf
 	../makesdna
 	../makesrna
-	../openvdb
 	../render/extern/include
 	../../../intern/guardedalloc
 	../../../intern/glew-mx
+	../../../intern/openvdb
 )
 
 set(INC_SYS
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript
index 181be02..d429600 100644
--- a/source/blender/nodes/SConscript
+++ b/source/blender/nodes/SConscript
@@ -78,6 +78,7 @@ if env['WITH_BF_FREESTYLE']:
 
 if env['WITH_BF_OPENVDB']:
     defs.append('WITH_OPENVDB')
+    incs += ' #/intern/openvdb'
 
 env.BlenderLib ( libname = 'bf_nodes', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [190,105] )
 env.BlenderLib ( libname = 'bf_cmpnodes', sources = cmpsources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [175,101] )
diff --git a/source/blender/pyth

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list