[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37868] branches/soc-2011-onion: merge with trunk 37867
Antony Riakiotakis
kalast at gmail.com
Mon Jun 27 17:35:11 CEST 2011
Revision: 37868
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37868
Author: psy-fi
Date: 2011-06-27 15:35:10 +0000 (Mon, 27 Jun 2011)
Log Message:
-----------
merge with trunk 37867
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/GNUmakefile
branches/soc-2011-onion/build_files/cmake/macros.cmake
branches/soc-2011-onion/build_files/scons/config/aix4-config.py
branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
branches/soc-2011-onion/doc/python_api/rst/change_log.rst
branches/soc-2011-onion/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-onion/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-onion/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2011-onion/intern/ghost/intern/GHOST_Window.h
branches/soc-2011-onion/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2011-onion/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2011-onion/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-onion/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-onion/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-onion/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2011-onion/intern/itasc/ConstraintSet.cpp
branches/soc-2011-onion/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-onion/source/blender/blenkernel/BKE_particle.h
branches/soc-2011-onion/source/blender/blenkernel/intern/blender.c
branches/soc-2011-onion/source/blender/blenkernel/intern/brush.c
branches/soc-2011-onion/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-onion/source/blender/blenkernel/intern/paint.c
branches/soc-2011-onion/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion/source/blender/blenkernel/intern/sound.c
branches/soc-2011-onion/source/blender/blenlib/BLI_math_color.h
branches/soc-2011-onion/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-onion/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-onion/source/blender/blenlib/intern/math_color.c
branches/soc-2011-onion/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/blenloader/intern/writefile.c
branches/soc-2011-onion/source/blender/editors/armature/armature_intern.h
branches/soc-2011-onion/source/blender/editors/armature/armature_ops.c
branches/soc-2011-onion/source/blender/editors/armature/editarmature.c
branches/soc-2011-onion/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-onion/source/blender/editors/interface/interface_style.c
branches/soc-2011-onion/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-onion/source/blender/editors/object/object_bake.c
branches/soc-2011-onion/source/blender/editors/render/render_opengl.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-onion/source/blender/editors/space_info/info_stats.c
branches/soc-2011-onion/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-onion/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-onion/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-onion/source/blender/imbuf/intern/divers.c
branches/soc-2011-onion/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2011-onion/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/soc-2011-onion/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2011-onion/source/blender/python/BPY_extern.h
branches/soc-2011-onion/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-onion/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-onion/source/blender/python/intern/bpy_app.c
branches/soc-2011-onion/source/blender/render/intern/source/convertblender.c
branches/soc-2011-onion/source/blender/render/intern/source/pipeline.c
branches/soc-2011-onion/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-onion/source/blender/render/intern/source/volumetric.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-onion/source/creator/creator.c
branches/soc-2011-onion/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-onion/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-onion/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-onion/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-onion/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2011-onion/doc/python_api/examples/aud.py
branches/soc-2011-onion/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-onion/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-onion/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-onion/source/blender/python/intern/bpy_app_handlers.h
Removed Paths:
-------------
branches/soc-2011-onion/source/blender/blenlib/intern/BLI_callbacks.h
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37756
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-37867
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-06-27 15:09:12 UTC (rev 37867)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-06-27 15:35:10 UTC (rev 37868)
@@ -57,6 +57,9 @@
# this starts out unset
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
+# avoid having empty buildtype
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
@@ -208,10 +211,6 @@
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
endif()
-if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
-endif()
-
if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
endif()
@@ -549,13 +548,13 @@
if(MSVC)
if(CMAKE_CL_64)
- set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid )
+ set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
else()
- set(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+ set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
endif()
- set(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4018 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4018 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB /nologo /Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB /nologo /Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -700,9 +699,9 @@
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
- set(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib /STACK:2097152 ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /MACHINE:X64 /STACK:2097152 /OPT:NOREF /INCREMENTAL:NO /NODEFAULTLIB:\"msvcrt.lib\" /NODEFAULTLIB:\"msvcmrt.lib\" /NODEFAULTLIB:\"msvcurt.lib\" /NODEFAULTLIB:\"msvcrtd.lib\" ")
else()
- set(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib /STACK:2097152 ")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /MACHINE:IX86 /STACK:2097152 /INCREMENTAL:NO /LARGEADDRESSAWARE /NODEFAULTLIB:\"msvcrt.lib\" /NODEFAULTLIB:\"msvcmrt.lib\" /NODEFAULTLIB:\"msvcurt.lib\" /NODEFAULTLIB:\"msvcrtd.lib\" ")
endif()
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
@@ -1001,7 +1000,7 @@
# Common.
if(APPLE OR WIN32)
- if(NOT IS_DIRECTORY "${LIBDIR}")
+ if(NOT EXISTS "${LIBDIR}/")
message(FATAL_ERROR "Apple and Windows require pre-compiled libs at: '${LIBDIR}'")
endif()
endif()
Modified: branches/soc-2011-onion/GNUmakefile
===================================================================
--- branches/soc-2011-onion/GNUmakefile 2011-06-27 15:09:12 UTC (rev 37867)
+++ branches/soc-2011-onion/GNUmakefile 2011-06-27 15:35:10 UTC (rev 37868)
@@ -75,7 +75,8 @@
@echo Building Blender ...
make -C $(BUILD_DIR) -s -j $(NPROCS) install
@echo
- @echo run blender from "$(BUILD_DIR)/bin/blender"
+ @echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
+ @echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
@echo
debug: all
Modified: branches/soc-2011-onion/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-06-27 15:09:12 UTC (rev 37867)
+++ branches/soc-2011-onion/build_files/cmake/macros.cmake 2011-06-27 15:35:10 UTC (rev 37868)
@@ -39,6 +39,21 @@
endmacro()
+
+macro(target_link_libraries_optimized TARGET LIBS)
+ foreach(_LIB ${LIBS})
+ target_link_libraries(${TARGET} optimized "${_LIB}")
+ endforeach()
+ unset(_LIB)
+endmacro()
+
+macro(target_link_libraries_debug TARGET LIBS)
+ foreach(_LIB ${LIBS})
+ target_link_libraries(${TARGET} debug "${_LIB}")
+ endforeach()
+ unset(_LIB)
+endmacro()
+
# Nicer makefiles with -I/1/foo/ instead of -I/1/2/3/../../foo/
# use it instead of include_directories()
macro(blender_include_dirs
@@ -202,9 +217,8 @@
if(WIN32 AND NOT UNIX)
file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
- target_link_libraries(${target}
- debug ${PYTHON_LIBRARIES_DEBUG}
- optimized ${PYTHON_LIBRARIES})
+ target_link_libraries_debug(${target} "${PYTHON_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target} "${PYTHON_LIBRARIES}")
unset(PYTHON_LIBRARIES_DEBUG)
else()
target_link_libraries(${target} ${PYTHON_LIBRARIES})
@@ -257,9 +271,8 @@
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")
- target_link_libraries(${target}
- debug ${OPENEXR_LIBRARIES_DEBUG}
- optimized ${OPENEXR_LIBRARIES})
+ target_link_libraries_debug(${target} "${OPENEXR_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target} "${OPENEXR_LIBRARIES}")
unset(OPENEXR_LIBRARIES_DEBUG)
else()
target_link_libraries(${target} ${OPENEXR_LIBRARIES})
@@ -274,22 +287,19 @@
if(WITH_OPENCOLLADA)
if(WIN32 AND NOT UNIX)
file_list_suffix(OPENCOLLADA_LIBRARIES_DEBUG "${OPENCOLLADA_LIBRARIES}" "_d")
- target_link_libraries(${target}
- debug ${OPENCOLLADA_LIBRARIES_DEBUG}
- optimized ${OPENCOLLADA_LIBRARIES})
+ target_link_libraries_debug(${target} "${OPENCOLLADA_LIBRARIES_DEBUG}")
+ target_link_libraries_optimized(${target} "${OPENCOLLADA_LIBRARIES}")
unset(OPENCOLLADA_LIBRARIES_DEBUG)
file_list_suffix(PCRE_LIB_DEBUG "${PCRE_LIB}" "_d")
- target_link_libraries(${target}
- debug ${PCRE_LIB_DEBUG}
- optimized ${PCRE_LIB})
+ target_link_libraries_debug(${target} "${PCRE_LIB_DEBUG}")
+ target_link_libraries_optimized(${target} "${PCRE_LIB}")
unset(PCRE_LIB_DEBUG)
if(EXPAT_LIB)
file_list_suffix(EXPAT_LIB_DEBUG "${EXPAT_LIB}" "_d")
- target_link_libraries(${target}
- debug ${EXPAT_LIB_DEBUG}
- optimized ${EXPAT_LIB})
+ target_link_libraries_debug(${target} "${EXPAT_LIB_DEBUG}")
+ target_link_libraries_optimized(${target} "${EXPAT_LIB}")
unset(EXPAT_LIB_DEBUG)
endif()
else()
Modified: branches/soc-2011-onion/build_files/scons/config/aix4-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/aix4-config.py 2011-06-27 15:09:12 UTC (rev 37867)
+++ branches/soc-2011-onion/build_files/scons/config/aix4-config.py 2011-06-27 15:35:10 UTC (rev 37868)
@@ -76,11 +76,6 @@
BF_GETTEXT_LIB = 'gettextpo intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_FTGL = 'false'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
WITH_BF_GAMEENGINE='false'
WITH_BF_BULLET = 'true'
Modified: branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py 2011-06-27 15:09:12 UTC (rev 37867)
+++ branches/soc-2011-onion/build_files/scons/config/win32-vc-config.py 2011-06-27 15:35:10 UTC (rev 37868)
@@ -173,7 +173,7 @@
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
REL_CXXFLAGS = ['-O2', '-DNDEBUG']
Modified: branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py 2011-06-27 15:09:12 UTC (rev 37867)
+++ branches/soc-2011-onion/build_files/scons/config/win64-vc-config.py 2011-06-27 15:35:10 UTC (rev 37868)
@@ -175,7 +175,7 @@
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr', '/Od']
-CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
REL_CXXFLAGS = ['-O2', '-DNDEBUG']
Copied: branches/soc-2011-onion/doc/python_api/examples/aud.py (from rev 37867, trunk/blender/doc/python_api/examples/aud.py)
===================================================================
--- branches/soc-2011-onion/doc/python_api/examples/aud.py (rev 0)
+++ branches/soc-2011-onion/doc/python_api/examples/aud.py 2011-06-27 15:35:10 UTC (rev 37868)
@@ -0,0 +1,21 @@
+"""
+Basic Sound Playback
+++++++++++++++++++++
+This script shows how to use the classes: :class:`Device`, :class:`Factory` and
+:class:`Handle`.
+"""
+import aud
+
+device = aud.device()
+# load sound file (it can be a video file with audio)
+factory = aud.Factory('music.ogg')
+
+# play the audio, this return a handle to control play/pause
+handle = device.play(sound)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list