[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30398] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 30397.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Thu Jul 15 23:05:12 CEST 2010
Revision: 30398
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30398
Author: kjym3
Date: 2010-07-15 23:05:11 +0200 (Thu, 15 Jul 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 30397.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30397
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/doc/blender.1
branches/soc-2008-mxcurioni/doc/blender.1.py
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
branches/soc-2008-mxcurioni/release/freedesktop/blender.desktop
branches/soc-2008-mxcurioni/release/scripts/io/import_anim_bvh.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
branches/soc-2008-mxcurioni/release/scripts/modules/add_object_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/op/fcurve_euler_filter.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
branches/soc-2008-mxcurioni/release/scripts/op/nla.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/sequencer.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/maya.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_uv.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs_blend.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_timeline.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/bge.types.rst
Added Paths:
-----------
branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/
branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh
Removed Paths:
-------------
branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-07-15 21:05:11 UTC (rev 30398)
@@ -55,10 +55,6 @@
SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
-# Note! - Could create this from the blender version string
-# ...but thats quite involved, make sure this matches the blender version.
-SET(BLENDER_VERSION 2.5)
-
#-----------------------------------------------------------------------------
# Load some macros.
INCLUDE(build_files/cmake/macros.cmake)
@@ -66,6 +62,8 @@
#-----------------------------------------------------------------------------
# Set default config options
+GET_BLENDER_VERSION()
+
# Blender internal features
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_LCMS "Enable color correction with lcms" OFF)
Copied: branches/soc-2008-mxcurioni/build_files/cmake/example_scripts (from rev 30397, trunk/blender/build_files/cmake/example_scripts)
Deleted: branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh
===================================================================
--- trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh 2010-07-15 21:05:11 UTC (rev 30398)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# This shell script checks out and compiles blender, tested on ubuntu 10.04
-# assumes you have dependancies installed alredy
-
-# See this page for more info:
-# http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
-
-# grab blender
-mkdir ~/blender-svn
-cd ~/blender-svn
-svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
-
-# create cmake dir
-mkdir ~/blender-svn/build-cmake
-cd ~/blender-svn/build-cmake
-
-# cmake without copying files for fast rebuilds
-# the files from svn will be used in place
-cmake ../blender -DWITH_INSTALL:BOOL=FALSE
-
-# make blender, will take some time
-make
-
-# link the binary to blenders source directory to run quickly
-ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
-
-# useful info
-echo ""
-echo "* Useful Commands *"
-echo " Run Blender: ~/blender-svn/blender/blender.bin"
-echo " Update Blender: svn up ~/blender-svn/blender"
-echo " Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
-echo " Build Blender: cd ~/blender-svn/build-cmake ; make"
-echo ""
-
-
Copied: branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh (from rev 30397, trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh)
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh (rev 0)
+++ branches/soc-2008-mxcurioni/build_files/cmake/example_scripts/cmake_linux_install.sh 2010-07-15 21:05:11 UTC (rev 30398)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# This shell script checks out and compiles blender, tested on ubuntu 10.04
+# assumes you have dependancies installed alredy
+
+# See this page for more info:
+# http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
+
+# grab blender
+mkdir ~/blender-svn
+cd ~/blender-svn
+svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
+
+# create cmake dir
+mkdir ~/blender-svn/build-cmake
+cd ~/blender-svn/build-cmake
+
+# cmake without copying files for fast rebuilds
+# the files from svn will be used in place
+cmake ../blender -DWITH_INSTALL:BOOL=FALSE
+
+# make blender, will take some time
+make
+
+# link the binary to blenders source directory to run quickly
+ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
+
+# useful info
+echo ""
+echo "* Useful Commands *"
+echo " Run Blender: ~/blender-svn/blender/blender.bin"
+echo " Update Blender: svn up ~/blender-svn/blender"
+echo " Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
+echo " Build Blender: cd ~/blender-svn/build-cmake ; make"
+echo ""
+
+
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2010-07-15 21:05:11 UTC (rev 30398)
@@ -198,3 +198,36 @@
SUPPORT_SSE_BUILD)
ENDMACRO(TEST_SSE_SUPPORT)
+MACRO(GET_BLENDER_VERSION)
+ FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT)
+ STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}")
+ STRING(REGEX REPLACE "\t" ";" CONTENT "${CONTENT}")
+ STRING(REGEX REPLACE " " ";" CONTENT "${CONTENT}")
+
+ FOREACH(ITEM ${CONTENT})
+ IF(LASTITEM MATCHES "BLENDER_VERSION")
+ MATH(EXPR BLENDER_VERSION_MAJOR "${ITEM} / 100")
+ MATH(EXPR BLENDER_VERSION_MINOR "${ITEM} % 100")
+ SET(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
+ ENDIF(LASTITEM MATCHES "BLENDER_VERSION")
+
+ IF(LASTITEM MATCHES "BLENDER_SUBVERSION")
+ SET(BLENDER_SUBVERSION ${ITEM})
+ ENDIF(LASTITEM MATCHES "BLENDER_SUBVERSION")
+
+ IF(LASTITEM MATCHES "BLENDER_MINVERSION")
+ MATH(EXPR BLENDER_MINVERSION_MAJOR "${ITEM} / 100")
+ MATH(EXPR BLENDER_MINVERSION_MINOR "${ITEM} % 100")
+ SET(BLENDER_MINVERSION "${BLENDER_MINVERSION_MAJOR}.${BLENDER_MINVERSION_MINOR}")
+ ENDIF(LASTITEM MATCHES "BLENDER_MINVERSION")
+
+ IF(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
+ SET(BLENDER_MINSUBVERSION ${ITEM})
+ ENDIF(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
+
+ SET(LASTITEM ${ITEM})
+ ENDFOREACH(ITEM ${CONTENT})
+
+ MESSAGE(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}")
+ MESSAGE(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}")
+ENDMACRO(GET_BLENDER_VERSION)
Modified: branches/soc-2008-mxcurioni/doc/blender.1
===================================================================
(Binary files differ)
Modified: branches/soc-2008-mxcurioni/doc/blender.1.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/blender.1.py 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/doc/blender.1.py 2010-07-15 21:05:11 UTC (rev 30398)
@@ -53,7 +53,7 @@
date_string = datetime.date.fromtimestamp(time.time()).strftime("%B %d, %Y")
-filepath = os.path.splitext(__file__)[0] + ".1"
+filepath = os.path.splitext(__file__)[0]
file = open(filepath, "w")
@@ -132,3 +132,5 @@
<mester at uni-bremen.de> and updated by Cyril Brulebois
<cyril.brulebois at enst-bretagne.fr> and Dan Eicher <dan at trollwerks.org>.
''')
+
+print("written:", filepath)
Modified: branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt 2010-07-15 21:05:11 UTC (rev 30398)
@@ -85,6 +85,9 @@
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_SystemX11.cpp
${CMAKE_CURRENT_SOURCE_DIR}/intern/GHOST_WindowX11.cpp
)
+
+ ADD_DEFINITIONS(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
+
ENDIF(APPLE)
BLENDERLIB(bf_ghost "${SRC}" "${INC}")
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp 2010-07-15 21:05:11 UTC (rev 30398)
@@ -67,6 +67,10 @@
#include <stdio.h> // for fprintf only
#include <cstdlib> // for exit
+#ifndef PREFIX
+# define PREFIX "/usr/local"
+#endif
+
typedef struct NDOFPlatformInfo {
Display *display;
Window window;
@@ -1461,7 +1465,7 @@
const GHOST_TUns8* GHOST_SystemX11::getSystemDir() const
{
- return (GHOST_TUns8*)"/usr/share";
+ return (GHOST_TUns8*) PREFIX "/share";
}
const GHOST_TUns8* GHOST_SystemX11::getUserDir() const
Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj 2010-07-15 21:05:11 UTC (rev 30398)
@@ -356,10 +356,6 @@
Filter="c"
>
<File
- RelativePath="..\..\..\source\blender\editors\datafiles\B.blend.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\editors\datafiles\Bfont.c"
>
</File>
@@ -387,6 +383,10 @@
RelativePath="..\..\..\source\blender\editors\datafiles\splash.png.c"
>
</File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\datafiles\startup.blend.c"
+ >
+ </File>
</Filter>
<Filter
Name="interface"
@@ -1347,6 +1347,10 @@
RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt_intern.h"
>
</File>
+ <File
+ RelativePath="..\..\..\source\blender\editors\sculpt_paint\sculpt_undo.c"
+ >
+ </File>
</Filter>
<Filter
Name="uvedit"
Modified: branches/soc-2008-mxcurioni/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
===================================================================
--- branches/soc-2008-mxcurioni/projectfiles_vc9/blender/gpu/BL_gpu.vcproj 2010-07-15 20:30:31 UTC (rev 30397)
+++ branches/soc-2008-mxcurioni/projectfiles_vc9/blender/gpu/BL_gpu.vcproj 2010-07-15 21:05:11 UTC (rev 30398)
@@ -508,7 +508,7 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="..\..\..\source\blender\gpu\gpu_buffers.h"
+ RelativePath="..\..\..\source\blender\gpu\GPU_buffers.h"
>
</File>
<File
Modified: branches/soc-2008-mxcurioni/release/freedesktop/blender.desktop
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list