[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31928] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31833 :31926
Nicholas Bishop
nicholasbishop at gmail.com
Wed Sep 15 01:37:58 CEST 2010
Revision: 31928
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31928
Author: nicholasbishop
Date: 2010-09-15 01:37:58 +0200 (Wed, 15 Sep 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31833:31926
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
branches/soc-2010-nicolasbishop/intern/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt
branches/soc-2010-nicolasbishop/release/VERSION
branches/soc-2010-nicolasbishop/release/datafiles/splash.png
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/client.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/master.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/operators.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/slave.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_types.py
branches/soc-2010-nicolasbishop/release/scripts/modules/io_utils.py
branches/soc-2010-nicolasbishop/release/scripts/op/add_mesh_torus.py
branches/soc-2010-nicolasbishop/release/scripts/op/image.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/nla.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/op/object_align.py
branches/soc-2010-nicolasbishop/release/scripts/op/object_randomize_transform.py
branches/soc-2010-nicolasbishop/release/scripts/op/presets.py
branches/soc-2010-nicolasbishop/release/scripts/op/sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/op/uv.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nicolasbishop/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-nicolasbishop/release/scripts/op/wm.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_material.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_scene.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_console.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_dopesheet.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_graph.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nicolasbishop/source/blender/blenfont/intern/blf_font.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_node.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/cloth.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/effect.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/node.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poseobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/splash.png.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/particle_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/space_node.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/space_time.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/ikplugin/BIK_api.h
branches/soc-2010-nicolasbishop/source/blender/ikplugin/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/ikplugin/SConscript
branches/soc-2010-nicolasbishop/source/blender/ikplugin/intern/Makefile
branches/soc-2010-nicolasbishop/source/blender/ikplugin/intern/ikplugin_api.c
branches/soc-2010-nicolasbishop/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_operator.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.h
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/soc-2010-nicolasbishop/build_files/package_spec/
branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/
branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD
branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install
branches/soc-2010-nicolasbishop/release/scripts/presets/keyconfig/
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/
branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD
branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install
branches/soc-2010-nicolasbishop/release/scripts/cfg/
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-09-14 22:33:29 UTC (rev 31927)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-09-14 23:37:58 UTC (rev 31928)
@@ -70,6 +70,7 @@
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON)
+OPTION(WITH_IK_ITASC "Enable ITASC IK solver" ON)
OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
OPTION(WITH_GAMEENGINE "Enable Game Engine" ON)
Copied: branches/soc-2010-nicolasbishop/build_files/package_spec (from rev 31926, trunk/blender/build_files/package_spec)
Copied: branches/soc-2010-nicolasbishop/build_files/package_spec/pacman (from rev 31926, trunk/blender/build_files/package_spec/pacman)
Deleted: branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD 2010-09-14 16:45:24 UTC (rev 31926)
+++ branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD 2010-09-14 23:37:58 UTC (rev 31928)
@@ -1,48 +0,0 @@
-# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
-
-# custom blender vars
-blender_srcdir=$srcdir/../../../..
-blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_subversion
-
-pkgname=blender-beta
-pkgver=$blender_ver_string
-pkgrel=1
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-url="www.blender.org"
-license=('GPL')
-groups=()
-depends=('libjpeg' 'libpng' 'openexr' 'python3>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake' 'svn')
-optdepends=()
-provides=('blender')
-conflicts=('blender')
-replaces=()
-backup=()
-options=()
-install=blender.install
-# use current svn to make the package.
-# source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-# md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
-source=()
-md5sums=()
-noextract=()
-
-build() {
- mkdir -p $srcdir/build
- cd $srcdir/build
- cmake $blender_srcdir \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DWITH_PYTHON_INSTALL:BOOL=OFF \
- -DWITH_OPENCOLLADA:BOOL=OFF
-
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR="$pkgdir" install
-}
Copied: branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD (from rev 31926, trunk/blender/build_files/package_spec/pacman/PKGBUILD)
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD (rev 0)
+++ branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/PKGBUILD 2010-09-14 23:37:58 UTC (rev 31928)
@@ -0,0 +1,48 @@
+# Maintainer: Campbell Barton <ideasman42 at gmail dot com>
+
+# custom blender vars
+blender_srcdir=$srcdir/../../../..
+blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100).$blender_subversion
+
+pkgname=blender-beta
+pkgver=$blender_ver_string
+pkgrel=1
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+url="www.blender.org"
+license=('GPL')
+groups=()
+depends=('libjpeg' 'libpng' 'openexr' 'python3>=3.1' 'gettext' 'libxi' 'libxmu' 'mesa' 'freetype2' 'openal' 'sdl' 'libsndfile' 'libsamplerate' 'ffmpeg')
+makedepends=('cmake' 'svn')
+optdepends=()
+provides=('blender')
+conflicts=('blender')
+replaces=()
+backup=()
+options=()
+install=blender.install
+# use current svn to make the package.
+# source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+# md5sums=('27edb80c82c25252d43d6a01980d953a') #generate with 'makepkg -g'
+source=()
+md5sums=()
+noextract=()
+
+build() {
+ mkdir -p $srcdir/build
+ cd $srcdir/build
+ cmake $blender_srcdir \
+ -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DWITH_PYTHON_INSTALL:BOOL=OFF \
+ -DWITH_OPENCOLLADA:BOOL=OFF
+
+ make
+}
+
+package() {
+ cd $srcdir/build
+ make DESTDIR="$pkgdir" install
+}
Deleted: branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install
===================================================================
--- trunk/blender/build_files/package_spec/pacman/blender.install 2010-09-14 16:45:24 UTC (rev 31926)
+++ branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install 2010-09-14 23:37:58 UTC (rev 31928)
@@ -1,29 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-Happy blending!
-
-EOF
- echo "update desktop mime database..."
- update-desktop-database
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- /bin/true
-}
-
-post_remove() {
- echo "update desktop mime database..."
- update-desktop-database
-}
-
-op=$1
-shift
-
-$op $*
Copied: branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install (from rev 31926, trunk/blender/build_files/package_spec/pacman/blender.install)
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install (rev 0)
+++ branches/soc-2010-nicolasbishop/build_files/package_spec/pacman/blender.install 2010-09-14 23:37:58 UTC (rev 31928)
@@ -0,0 +1,29 @@
+post_install() {
+ cat << EOF
+
+NOTE
+----
+Happy blending!
+
+EOF
+ echo "update desktop mime database..."
+ update-desktop-database
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ /bin/true
+}
+
+post_remove() {
+ echo "update desktop mime database..."
+ update-desktop-database
+}
+
+op=$1
+shift
+
+$op $*
Modified: branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py 2010-09-14 22:33:29 UTC (rev 31927)
+++ branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py 2010-09-14 23:37:58 UTC (rev 31928)
@@ -15,7 +15,7 @@
Variables = SCons.Variables
BoolVariable = SCons.Variables.BoolVariable
-VERSION = '2.53' # This is used in creating the local config directories
+VERSION = '2.54' # This is used in creating the local config directories
def print_arguments(args, bc):
if len(args):
Modified: branches/soc-2010-nicolasbishop/intern/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/intern/CMakeLists.txt 2010-09-14 22:33:29 UTC (rev 31927)
+++ branches/soc-2010-nicolasbishop/intern/CMakeLists.txt 2010-09-14 23:37:58 UTC (rev 31928)
@@ -33,7 +33,6 @@
ADD_SUBDIRECTORY(memutil)
ADD_SUBDIRECTORY(decimation)
ADD_SUBDIRECTORY(iksolver)
-ADD_SUBDIRECTORY(itasc)
ADD_SUBDIRECTORY(boolop)
ADD_SUBDIRECTORY(opennl)
ADD_SUBDIRECTORY(smoke)
@@ -42,4 +41,8 @@
ADD_SUBDIRECTORY(elbeem)
ENDIF(WITH_FLUID)
+IF(WITH_IK_ITASC)
+ ADD_SUBDIRECTORY(itasc)
+ENDIF(WITH_IK_ITASC)
+
ADD_SUBDIRECTORY(bsp)
Modified: branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt 2010-09-14 22:33:29 UTC (rev 31927)
+++ branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt 2010-09-14 23:37:58 UTC (rev 31928)
@@ -33,35 +33,35 @@
)
SET(SRC
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Buttons.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_CallbackEventConsumer.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_C-api.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManager.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_EventManager.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_EventPrinter.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_ISystem.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_ModifierKeys.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_NDOFManager.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Path-api.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Rect.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_System.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_TimerManager.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_Window.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowManager.cpp
+ ./intern/GHOST_Buttons.cpp
+ ./intern/GHOST_CallbackEventConsumer.cpp
+ ./intern/GHOST_C-api.cpp
+ ./intern/GHOST_DisplayManager.cpp
+ ./intern/GHOST_EventManager.cpp
+ ./intern/GHOST_EventPrinter.cpp
+ ./intern/GHOST_ISystem.cpp
+ ./intern/GHOST_ModifierKeys.cpp
+ ./intern/GHOST_NDOFManager.cpp
+ ./intern/GHOST_Path-api.cpp
+ ./intern/GHOST_Rect.cpp
+ ./intern/GHOST_System.cpp
+ ./intern/GHOST_TimerManager.cpp
+ ./intern/GHOST_Window.cpp
+ ./intern/GHOST_WindowManager.cpp
)
IF(APPLE)
IF(WITH_COCOA)
LIST(APPEND SRC
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCocoa.mm
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCocoa.mm
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCocoa.mm
+ ./intern/GHOST_DisplayManagerCocoa.mm
+ ./intern/GHOST_SystemCocoa.mm
+ ./intern/GHOST_WindowCocoa.mm
)
ELSE(WITH_COCOA)
LIST(APPEND SRC
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerCarbon.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemCarbon.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowCarbon.cpp
+ ./intern/GHOST_DisplayManagerCarbon.cpp
+ ./intern/GHOST_SystemCarbon.cpp
+ ./intern/GHOST_WindowCarbon.cpp
)
ENDIF(WITH_COCOA)
@@ -72,18 +72,18 @@
LIST(APPEND INC ${WINTAB_INC})
LIST(APPEND SRC
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DisplayManagerWin32.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemWin32.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowWin32.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_DropTargetWin32.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list