[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36200] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 36199.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Apr 17 16:20:44 CEST 2011
Revision: 36200
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36200
Author: kjym3
Date: 2011-04-17 14:20:43 +0000 (Sun, 17 Apr 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 36199.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36199
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.sh
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/release/datafiles/splash.png
branches/soc-2008-mxcurioni/release/release_todo.txt
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/console_python.py
branches/soc-2008-mxcurioni/release/scripts/modules/io_utils.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_font.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.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/blenderplayer/CMakeLists.txt
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/tests/CMakeLists.txt
Removed Paths:
-------------
branches/soc-2008-mxcurioni/extern/eltopo/
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-36092
+ /trunk/blender:34011-36199
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-04-17 14:20:43 UTC (rev 36200)
@@ -64,7 +64,6 @@
if (_reset_standard_libraries)
- message("Reset Libs")
# Must come after project(...)
#
# MINGW workaround for -ladvapi32 being included which surprisingly causes
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-i686.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
# Python configuration
BF_PYTHON_VERSION = '3.2'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-i686.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
# Python configuration
BF_PYTHON_VERSION = '3.2'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
# Python configuration
BF_PYTHON_VERSION = '3.2'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-x86_64.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -1,5 +1,6 @@
BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
# Python configuration
BF_PYTHON_VERSION = '3.2'
Modified: branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -60,31 +60,14 @@
if builder.startswith('linux'):
import shutil
- cores = 1
- if hasattr(os, 'sysconf'):
- if 'SC_NPROCESSORS_ONLN' in os.sysconf_names:
- cores = os.sysconf('SC_NPROCESSORS_ONLN')
-
- if cores > 1:
- # there're two chroot environments in one machine,
- # so use only a half of power for better performance
- cores = cores / 2
-
# We're using the same rules as release builder, so tweak
# build and install dirs
build_dir = os.path.join('..', 'build', builder)
install_dir = os.path.join('..', 'install', builder)
- common_options = ['BF_NUMJOBS=' + str(cores),
- 'BF_BUILDDIR=' + build_dir,
- 'BF_INSTALLDIR=' + install_dir]
+ common_options = ['BF_INSTALLDIR=' + install_dir]
- # Clean all directories first
- retcode = subprocess.call(scons_cmd + common_options + ['clean'])
- if retcode != 0:
- print('Error cleaning build directory')
- sys.exit(retcode)
-
+ # Clean install directory so we'll be sure there's no
if os.path.isdir(install_dir):
shutil.rmtree(install_dir)
@@ -103,6 +86,12 @@
config_fpath = os.path.join(config_dir, config)
scons_options = []
+
+ if config.find('player') != -1:
+ scons_options.append('BF_BUILDDIR=%s_player' % (build_dir))
+ else:
+ scons_options.append('BF_BUILDDIR=%s' % (build_dir))
+
scons_options += common_options
if config.find('player') == -1:
Modified: branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/cmake/FindPythonLibsUnix.cmake 2011-04-17 14:20:43 UTC (rev 36200)
@@ -4,7 +4,7 @@
# PYTHON_INCLUDE_DIRS
# PYTHON_LIBRARY
# PYTHON_LIBPATH
-# PYTHON_LINKFLAGSPYTHON
+# PYTHON_LINKFLAGS
#=============================================================================
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2011-04-17 14:20:43 UTC (rev 36200)
@@ -376,7 +376,8 @@
set(BLENDER_VERSION_CYCLE ${_out_version_cycle})
# for packaging, alpha to numbers
- if(${BLENDER_VERSION_CHAR})
+ string(COMPARE EQUAL "${BLENDER_VERSION_CHAR}" "" _out_version_char_empty)
+ if(${_out_version_char_empty})
set(BLENDER_VERSION_CHAR_INDEX "0")
else()
set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
@@ -388,6 +389,7 @@
unset(_out_subversion)
unset(_out_version_char)
+ unset(_out_version_char_empty)
unset(_out_version_cycle)
# message(STATUS "Version (Internal): ${BLENDER_VERSION}.${BLENDER_SUBVERSION}, Version (external): ${BLENDER_VERSION}${BLENDER_VERSION_CHAR}-${BLENDER_VERSION_CYCLE}")
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -99,7 +99,7 @@
'WITH_BF_INTERNATIONAL',
'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
- 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'WITH_BF_ELTOPO', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+ 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
'BF_WINTAB', 'BF_WINTAB_INC',
'WITH_BF_FREETYPE', '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',
@@ -365,8 +365,6 @@
(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_BULLET', 'Bullet base dir', ''),
('BF_BULLET_INC', 'Bullet include path', ''),
('BF_BULLET_LIB', 'Bullet library', ''),
Modified: branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile
===================================================================
--- branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile 2011-04-17 14:20:43 UTC (rev 36200)
@@ -31,7 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = "V2.56a BETA"
+PROJECT_NUMBER = "V2.57"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer
Modified: branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py 2011-04-17 12:47:20 UTC (rev 36199)
+++ branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py 2011-04-17 14:20:43 UTC (rev 36200)
@@ -881,14 +881,18 @@
if bpy.app.build_revision != "Unknown":
version_string = version_string + " r" + bpy.app.build_revision
- # for use with files
version_string_fp = "_".join(str(v) for v in bpy.app.version)
+ if bpy.app.version_cycle == "release":
+ version_string_pdf = "%s%s_release" % ("_".join(str(v) for v in bpy.app.version[:2]), bpy.app.version_char)
+ else:
+ version_string_pdf = version_string_fp
+
fw("project = 'Blender'\n")
# fw("master_doc = 'index'\n")
fw("copyright = u'Blender Foundation'\n")
- fw("version = '%s - UNSTABLE API'\n" % version_string)
- fw("release = '%s - UNSTABLE API'\n" % version_string)
+ fw("version = '%s - API'\n" % version_string)
+ fw("release = '%s - API'\n" % version_string)
fw("html_theme = 'blender-org'\n")
fw("html_theme_path = ['../']\n")
fw("html_favicon = 'favicon.ico'\n")
@@ -909,30 +913,19 @@
fw(" Blender Documentation contents\n")
fw("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n")
fw("\n")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list