[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49834] branches/soc-2011-tomato: Merging r49815 through r49833 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Sun Aug 12 12:07:55 CEST 2012
Revision: 49834
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49834
Author: nazgul
Date: 2012-08-12 10:07:55 +0000 (Sun, 12 Aug 2012)
Log Message:
-----------
Merging r49815 through r49833 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49815
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49833
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/cmake/macros.cmake
branches/soc-2011-tomato/build_files/scons/config/linux-config.py
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/extern/eltopo/SConscript
branches/soc-2011-tomato/intern/container/CTR_HashedPtr.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-tomato/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2011-tomato/intern/string/STR_String.h
branches/soc-2011-tomato/release/datafiles/bfont.pfb
branches/soc-2011-tomato/release/datafiles/startup.blend
branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/sca.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/unit.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_rect.h
branches/soc-2011-tomato/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-tomato/source/blender/blenlib/intern/rct.c
branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-tomato/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_create.c
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl
branches/soc-2011-tomato/source/blender/datatoc/datatoc.c
branches/soc-2011-tomato/source/blender/editors/include/ED_object.h
branches/soc-2011-tomato/source/blender/editors/include/UI_view2d.h
branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
branches/soc-2011-tomato/source/blender/editors/object/object_modifier.c
branches/soc-2011-tomato/source/blender/editors/physics/dynamicpaint_ops.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-tomato/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/screen/screendump.c
branches/soc-2011-tomato/source/blender/editors/space_clip/clip_ops.c
branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2011-tomato/source/blender/editors/space_file/filelist.c
branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_view.c
branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl
branches/soc-2011-tomato/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/WM_types.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-tomato/source/gameengine/Expressions/StringValue.h
branches/soc-2011-tomato/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PythonInit.cpp
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/datatoc/CMakeLists.txt
branches/soc-2011-tomato/source/blender/datatoc/datatoc.c
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49814
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49833
Modified: branches/soc-2011-tomato/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/build_files/cmake/macros.cmake 2012-08-12 10:07:55 UTC (rev 49834)
@@ -733,7 +733,6 @@
endmacro()
-# TODO, create a C binary and call it instead!, doing this in cmake its slow
macro(data_to_c
file_from file_to
list_to_add)
@@ -745,34 +744,32 @@
add_custom_command(
OUTPUT ${file_to}
COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
- COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc
- ${file_from}
- ${file_to}
- DEPENDS ${file_from})
+ COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${file_from} ${file_to}
+ DEPENDS ${file_from} datatoc)
unset(_file_to_path)
endmacro()
+
# same as above but generates the var name and output automatic.
macro(data_to_c_simple
file_from
list_to_add)
- # only to avoid confusion
- set(_file_to ${file_from}.c)
+ # remove ../'s
+ get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+ get_filename_component(_file_to ${CMAKE_CURRENT_BINARY_DIR}/${file_from}.c REALPATH)
- list(APPEND ${list_to_add} ${CMAKE_CURRENT_BINARY_DIR}/${_file_to})
+ list(APPEND ${list_to_add} ${_file_to})
get_filename_component(_file_to_path ${_file_to} PATH)
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
+ OUTPUT ${_file_to}
COMMAND ${CMAKE_COMMAND} -E make_directory ${_file_to_path}
- COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc
- ${CMAKE_CURRENT_SOURCE_DIR}/${file_from}
- ${CMAKE_CURRENT_BINARY_DIR}/${_file_to}
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${file_from})
+ COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/datatoc ${_file_from} ${_file_to}
+ DEPENDS ${_file_from} datatoc)
- unset(_var_name)
+ unset(_file_from)
unset(_file_to)
unset(_file_to_path)
endmacro()
Modified: branches/soc-2011-tomato/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/linux-config.py 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/build_files/scons/config/linux-config.py 2012-08-12 10:07:55 UTC (rev 49834)
@@ -105,6 +105,11 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
+WITH_BF_ELTOPO = False
+BF_LAPACK = '/usr'
+BF_LAPACK_LIB = 'lapack3gf blas clapack'
+BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
+
BF_FREETYPE = '/usr'
BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
BF_FREETYPE_LIB = 'freetype'
Modified: branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py 2012-08-12 10:07:55 UTC (rev 49834)
@@ -101,6 +101,11 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
+WITH_BF_ELTOPO = False
+BF_LAPACK = LIBDIR + '/lapack'
+BF_LAPACK_LIB = 'libf2c clapack_nowrap BLAS_nowrap'
+BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
+
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py 2012-08-12 10:07:55 UTC (rev 49834)
@@ -97,6 +97,11 @@
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
+WITH_BF_ELTOPO = False
+BF_LAPACK = LIBDIR + '/lapack'
+BF_LAPACK_LIB = 'libf2c clapack_nowrap BLAS_nowrap'
+BF_LAPACK_LIBPATH = '${BF_LAPACK}/lib'
+
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2012-08-12 10:07:55 UTC (rev 49834)
@@ -159,6 +159,10 @@
libincs += Split(lenv['BF_FFTW3_LIBPATH'])
if lenv['WITH_BF_STATICFFTW3']:
statlibs += Split(lenv['BF_FFTW3_LIB_STATIC'])
+ if lenv['WITH_BF_ELTOPO']:
+ libincs += Split(lenv['BF_LAPACK_LIBPATH'])
+ if lenv['WITH_BF_STATICLAPACK']:
+ statlibs += Split(lenv['BF_LAPACK_LIB_STATIC'])
if lenv['WITH_BF_FFMPEG'] and lenv['WITH_BF_STATICFFMPEG']:
statlibs += Split(lenv['BF_FFMPEG_LIB_STATIC'])
if lenv['WITH_BF_INTERNATIONAL']:
@@ -273,6 +277,8 @@
syslibs += Split(lenv['BF_SNDFILE_LIB'])
if lenv['WITH_BF_FFTW3'] and not lenv['WITH_BF_STATICFFTW3']:
syslibs += Split(lenv['BF_FFTW3_LIB'])
+ if lenv['WITH_BF_ELTOPO']:
+ syslibs += Split(lenv['BF_LAPACK_LIB'])
if lenv['WITH_BF_SDL']:
syslibs += Split(lenv['BF_SDL_LIB'])
if not lenv['WITH_BF_STATICOPENGL']:
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-08-12 10:07:55 UTC (rev 49834)
@@ -120,7 +120,7 @@
'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
'WITH_BF_GAMEENGINE',
'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
- 'WITH_BF_ELTOPO',
+ 'WITH_BF_ELTOPO', 'BF_LAPACK', 'BF_LAPACK_LIB', 'BF_LAPACK_LIBPATH', 'BF_LAPACK_LIB_STATIC',
'BF_WINTAB', 'BF_WINTAB_INC',
'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
@@ -394,7 +394,13 @@
(BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
(BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
+
(BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
+ ('BF_LAPACK', 'LAPACK base path', ''),
+ ('BF_LAPACK_LIB', 'LAPACK library', ''),
+ ('BF_LAPACK_LIB_STATIC', 'LAPACK library', ''),
+ ('BF_LAPACK_LIBPATH', 'LAPACK library path', ''),
+ (BoolVariable('WITH_BF_STATICLAPACK', 'Staticly link to LAPACK', False)),
('BF_BULLET', 'Bullet base dir', ''),
('BF_BULLET_INC', 'Bullet include path', ''),
Modified: branches/soc-2011-tomato/extern/eltopo/SConscript
===================================================================
--- branches/soc-2011-tomato/extern/eltopo/SConscript 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/extern/eltopo/SConscript 2012-08-12 10:07:55 UTC (rev 49834)
@@ -1,28 +1,20 @@
#!/usr/bin/python
-import sys
-import os
Import('env')
-defs = ' -DUSE_FORTRAN_BLAS -DNOGUI'
-cflags = []
+defs = []
-if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- defs += ' WIN32 NDEBUG _WINDOWS'
- #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
- cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
-elif env['OURPLATFORM'] in ('win32-mingw', 'linuxcross', 'win64-mingw'):
- defs += ' NDEBUG'
- cflags += ['-O2']
-elif env['OURPLATFORM'] in ('linux', 'freebsd4', 'freebsd5'):
- defs += ' NDEBUG'
- cflags += ['-O2']
-elif sys.platform=='darwin':
- defs += ' NDEBUG'
- cflags += ['-O2','-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
-eltopo_src = env.Glob("common/*.cpp") + env.Glob("eltopo3d/*.cpp") + env.Glob("common/newsparse/*.cpp") + env.Glob("common/sparse/*.cpp") + env.Glob("common/meshes/*.cpp") + ["eltopo-capi.cpp"]
-incs = '. common eltopo3d common/newsparse common/meshes common/sparse'
+eltopo_src = env.Glob("common/*.cpp") + env.Glob("eltopo3d/*.cpp") + env.Glob("common/newsparse/*.cpp") + env.Glob("common/sparse/*.cpp") + ["eltopo-capi.cpp"]
+eltopo_src.remove( "common\\gluvi.cpp" )
+eltopo_src.remove( "common\\openglutils.cpp" )
-env.BlenderLib ( libname = 'extern_eltopo3d', sources=eltopo_src, includes=Split(incs), defines=Split(defs), libtype=['extern','player'], priority=[20,137], compileflags=cflags )
+# print(eltopo_src)
+defs.append('USE_FORTRAN_BLAS')
+defs.append('NO_GUI')
+
+incs = '. common eltopo3d common/newsparse common/meshes common/sparse common/tunicate'
+
+env.BlenderLib ('extern_eltopo3d', Split(eltopo_src), Split(incs), defs, libtype=['extern'], priority=[40] )
+
Modified: branches/soc-2011-tomato/intern/container/CTR_HashedPtr.h
===================================================================
--- branches/soc-2011-tomato/intern/container/CTR_HashedPtr.h 2012-08-12 10:03:33 UTC (rev 49833)
+++ branches/soc-2011-tomato/intern/container/CTR_HashedPtr.h 2012-08-12 10:07:55 UTC (rev 49834)
@@ -38,7 +38,7 @@
inline unsigned int CTR_Hash(void *inDWord)
{
size_t key = (size_t)inDWord;
- return (unsigned int)(key ^ (key>>4));
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list