[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40490] branches/bmesh/blender: svn merge ^/trunk/blender -r40405:40431
Campbell Barton
ideasman42 at gmail.com
Fri Sep 23 13:30:55 CEST 2011
Revision: 40490
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40490
Author: campbellbarton
Date: 2011-09-23 11:30:55 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40405:40431
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40405
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/buildbot/master_unpack.py
branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py
branches/bmesh/blender/build_files/cmake/project_source_info.py
branches/bmesh/blender/build_files/scons/config/irix6-config.py
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/intern/audaspace/CMakeLists.txt
branches/bmesh/blender/intern/ghost/SConscript
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h
branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
branches/bmesh/blender/intern/opennl/superlu/superlu_sys_types.h
branches/bmesh/blender/po/update_mo.py
branches/bmesh/blender/po/update_po.py
branches/bmesh/blender/po/update_pot.py
branches/bmesh/blender/release/bin/.blender/fonts/droidsans.ttf.gz
branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_animviz.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_common.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_scene.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_text.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenfont/intern/blf.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_lang.c
branches/bmesh/blender/source/blender/blenkernel/BKE_colortools.h
branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenlib/intern/storage.c
branches/bmesh/blender/source/blender/blenlib/intern/threads.c
branches/bmesh/blender/source/blender/blenloader/BLO_sys_types.h
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_style.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/screen/glutil.c
branches/bmesh/blender/source/blender/editors/space_logic/CMakeLists.txt
branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/RNA_types.h
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_animation.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_rna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_navmesh.c
branches/bmesh/blender/source/blender/nodes/intern/node_util.h
branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/python/intern/bpy_interface_atexit.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/bmesh/blender/source/tests/bl_load_py_modules.py
Added Paths:
-----------
branches/bmesh/blender/po/update_msg.py
Removed Paths:
-------------
branches/bmesh/blender/release/irix-6.2-mips/
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/extern/recastnavigation/recast-capi.cpp
branches/bmesh/blender/extern/recastnavigation/recast-capi.h
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40405
+ /trunk/blender:39992-40431
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-09-23 11:15:47 UTC (rev 40489)
+++ branches/bmesh/blender/GNUmakefile 2011-09-23 11:30:55 UTC (rev 40490)
@@ -130,6 +130,10 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
+ @echo "Other Targets"
+ @echo " * translations - update blenders translation files in po/"
+ # TODO, doxygen and sphinx docs
+ @echo ""
@echo "Testing Targets (not assosiated with building blender)"
@echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@@ -157,6 +161,16 @@
# -----------------------------------------------------------------------------
+# Other Targets
+#
+translations:
+ $(BUILD_DIR)/bin/blender --background --python po/update_msg.py
+ python3 po/update_pot.py
+ python3 po/update_po.py
+ python3 po/update_mo.py
+
+
+# -----------------------------------------------------------------------------
# Tests
#
test:
Modified: branches/bmesh/blender/build_files/buildbot/master_unpack.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/master_unpack.py 2011-09-23 11:15:47 UTC (rev 40489)
+++ branches/bmesh/blender/build_files/buildbot/master_unpack.py 2011-09-23 11:30:55 UTC (rev 40490)
@@ -48,11 +48,11 @@
tokens = filename.split("-")
platforms = ('osx', 'mac', 'bsd',
'win', 'linux', 'source',
- 'irix', 'solaris')
+ 'solaris')
platform_tokens = []
found = False
- for i, token in enumerate(tokens):
+ for token in tokens:
if not found:
for platform in platforms:
if platform in token.lower():
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-23 11:15:47 UTC (rev 40489)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-23 11:30:55 UTC (rev 40490)
@@ -43,6 +43,7 @@
# "--enable=all", # if you want sixty hundred pedantic suggestions
]
+
def main():
source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
@@ -58,12 +59,12 @@
check_commands.append((c, cmd))
for i, (c, cmd) in enumerate(check_commands):
- percent = 100.0 * (i / (len(check_commands)-1))
+ percent = 100.0 * (i / (len(check_commands) - 1))
percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
-
+
# if percent < 27.9:
# continue
-
+
# let cppcheck finish the line off...
sys.stdout.write("%s " % percent_str)
Modified: branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py 2011-09-23 11:15:47 UTC (rev 40489)
+++ branches/bmesh/blender/build_files/cmake/cmake_static_check_splint.py 2011-09-23 11:30:55 UTC (rev 40490)
@@ -58,9 +58,9 @@
# re-definitions, rna causes most of these
"-redef",
"-syntax",
-
+
# dummy, witjout this splint complains with:
- # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
+ # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
"-D_PC_MAX_CANON=0",
]
Modified: branches/bmesh/blender/build_files/cmake/project_source_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_source_info.py 2011-09-23 11:15:47 UTC (rev 40489)
+++ branches/bmesh/blender/build_files/cmake/project_source_info.py 2011-09-23 11:30:55 UTC (rev 40490)
@@ -27,7 +27,6 @@
)
import os
-import sys
from os.path import join, dirname, normpath, abspath
SOURCE_DIR = join(dirname(__file__), "..", "..")
@@ -40,11 +39,6 @@
return (ext in (".h", ".hpp", ".hxx"))
-def is_c_header(filename):
- ext = os.path.splitext(filename)[1]
- return (ext in (".h", ".hpp", ".hxx"))
-
-
def is_c(filename):
ext = os.path.splitext(filename)[1]
return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
@@ -79,6 +73,7 @@
def makefile_log():
import subprocess
+ import time
# Check blender is not 2.5x until it supports playback again
print("running make with --dry-run ...")
process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
Modified: branches/bmesh/blender/build_files/scons/config/irix6-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/irix6-config.py 2011-09-23 11:15:47 UTC (rev 40489)
+++ branches/bmesh/blender/build_files/scons/config/irix6-config.py 2011-09-23 11:30:55 UTC (rev 40490)
@@ -1,208 +0,0 @@
-import os
-
-LCGDIR = os.getcwd()+"/../lib/irix-6.5-mips"
-LIBDIR = LCGDIR
-
-BF_PYTHON = LCGDIR+'/python'
-BF_PYTHON_VERSION = '3.2'
-WITH_BF_STATICPYTHON = 'true'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
-BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
-
-WITH_BF_OPENAL = 'true'
-WITH_BF_STATICOPENAL = 'true'
-BF_OPENAL = LCGDIR+'/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
-BF_OPENAL_LIBPATH = LIBDIR + '/lib'
-
-BF_CXX = '/usr'
-WITH_BF_STATICCXX = 'false'
-BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-
-BF_LIBSAMPLERATE = LCGDIR+'/samplerate'
-BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
-BF_LIBSAMPLERATE_LIB = 'samplerate'
-BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
-
-WITH_BF_SDL = 'true'
-BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
-BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
-BF_SDL_LIB = 'SDL audio iconv charset' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
-BF_SDL_LIBPATH = '${BF_SDL}/lib'
-
-WITH_BF_OPENEXR = 'false'
-WITH_BF_STATICOPENEXR = 'false'
-BF_OPENEXR = '/usr'
-# when compiling with your own openexr lib you might need to set...
-# BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
-BF_OPENEXR_LIB = 'Half IlmImf Iex Imath '
-BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-# BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
-
-
-WITH_BF_DDS = 'false'
-
-WITH_BF_JPEG = 'false'
-BF_JPEG = LCGDIR+'/jpeg'
-BF_JPEG_INC = '${BF_JPEG}/include'
-BF_JPEG_LIB = 'jpeg'
-BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-
-WITH_BF_PNG = 'false'
-BF_PNG = LCGDIR+"/png"
-BF_PNG_INC = '${BF_PNG}/include'
-BF_PNG_LIB = 'png'
-BF_PNG_LIBPATH = '${BF_PNG}/lib'
-
-BF_TIFF = '/usr/nekoware'
-BF_TIFF_INC = '${BF_TIFF}/include'
-
-WITH_BF_ZLIB = 'true'
-BF_ZLIB = LCGDIR+"/zlib"
-BF_ZLIB_INC = '${BF_ZLIB}/include'
-BF_ZLIB_LIB = 'z'
-BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-
-WITH_BF_INTERNATIONAL = 'true'
-
-BF_GETTEXT = LCGDIR+'/gettext'
-BF_GETTEXT_INC = '${BF_GETTEXT}/include'
-BF_GETTEXT_LIB = 'gettextpo intl'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-WITH_BF_GAMEENGINE='false'
-WITH_BF_PLAYER = 'false'
-
-WITH_BF_BULLET = 'true'
-BF_BULLET = '#extern/bullet2/src'
-BF_BULLET_INC = '${BF_BULLET}'
-BF_BULLET_LIB = 'extern_bullet'
-
-#WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB =
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = 'true'
-
-# enable freetype2 support for text objects
-BF_FREETYPE = LCGDIR+'/freetype'
-BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
-BF_FREETYPE_LIB = 'freetype'
-BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-
-WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME
-BF_QUICKTIME = '/usr/local'
-BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
-
-WITH_BF_ICONV = 'true'
-BF_ICONV = LIBDIR + "/iconv"
-BF_ICONV_INC = '${BF_ICONV}/include'
-BF_ICONV_LIB = 'iconv charset'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
-
-WITH_BF_BINRELOC = 'false'
-
-# enable ffmpeg support
-WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
-# Uncomment the following two lines to use system's ffmpeg
-BF_FFMPEG = LCGDIR+'/ffmpeg'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice faad faac vorbis x264 ogg mp3lame z'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-
-# enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = 'false' # -DWITH_OGG
-BF_OGG = '/usr'
-BF_OGG_INC = '${BF_OGG}/include'
-BF_OGG_LIB = 'ogg vorbis theoraenc theoradec'
-
-WITH_BF_OPENJPEG = 'false'
-BF_OPENJPEG = '#extern/libopenjpeg'
-BF_OPENJPEG_LIB = ''
-BF_OPENJPEG_INC = '${BF_OPENJPEG}'
-BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-
-WITH_BF_REDCODE = 'false'
-BF_REDCODE = '#extern/libredcode'
-BF_REDCODE_LIB = ''
-BF_REDCODE_INC = '${BF_REDCODE}/include'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list