[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41077] branches/bmesh/blender: svn merge ^/trunk/blender -r41005:41075
Campbell Barton
ideasman42 at gmail.com
Mon Oct 17 05:40:13 CEST 2011
Revision: 41077
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41077
Author: campbellbarton
Date: 2011-10-17 03:40:10 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41005:41075
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41005
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/cmake/Modules/FindGLEW.cmake
branches/bmesh/blender/build_files/cmake/RpmBuild.cmake
branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/doc/manpage/blender.1.py
branches/bmesh/blender/doc/python_api/examples/mathutils.Euler.py
branches/bmesh/blender/doc/python_api/examples/mathutils.Matrix.py
branches/bmesh/blender/doc/python_api/examples/mathutils.Quaternion.py
branches/bmesh/blender/doc/python_api/rst/bge.logic.rst
branches/bmesh/blender/doc/python_api/rst/bgl.rst
branches/bmesh/blender/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/bmesh/blender/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/bmesh/blender/intern/audaspace/intern/AUD_C-API.cpp
branches/bmesh/blender/po/es.po
branches/bmesh/blender/po/fr.po
branches/bmesh/blender/po/update_msg.py
branches/bmesh/blender/po/zh_CN.po
branches/bmesh/blender/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
branches/bmesh/blender/source/blender/blenkernel/BKE_paint.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenlib/BLI_path_util.h
branches/bmesh/blender/source/blender/blenlib/BLI_string.h
branches/bmesh/blender/source/blender/blenlib/intern/bpath.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenlib/intern/string_utf8.c
branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/collada/DocumentImporter.cpp
branches/bmesh/blender/source/blender/collada/ImageExporter.cpp
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/gpencil/editaction_gpencil.c
branches/bmesh/blender/source/blender/editors/include/ED_fileselect.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_anim.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/filelist.c
branches/bmesh/blender/source/blender/editors/space_file/filesel.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/space_sequencer.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/util/crazyspace.c
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_constraint_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_ipo_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/nodes/intern/node_exec.c
branches/bmesh/blender/source/blender/nodes/intern/node_socket.c
branches/bmesh/blender/source/blender/python/intern/bpy_library.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/darwin/blender.app/Contents/Info.plist
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
Added Paths:
-----------
branches/bmesh/blender/doc/python_api/examples/mathutils.Color.py
branches/bmesh/blender/release/scripts/templates/driver_functions.py
branches/bmesh/blender/source/darwin/set_simulation_threads.app/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/bmesh/blender/source/darwin/set_simulation_threads_applescript.scpt
Removed Paths:
-------------
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/bmesh/blender/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41005
+ /trunk/blender:39992-41075
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-10-17 03:23:10 UTC (rev 41076)
+++ branches/bmesh/blender/GNUmakefile 2011-10-17 03:40:10 UTC (rev 41077)
@@ -34,11 +34,14 @@
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
-BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
BUILD_TYPE:=Release
BUILD_CMAKE_ARGS:=
+ifndef BUILD_DIR
+ BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+endif
+
# -----------------------------------------------------------------------------
# additional targets for the build configuration
@@ -120,6 +123,9 @@
@echo " * headless - build without an interface (renderfarm or server automation)"
@echo " * bpy - build as a python module which can be loaded from python directly"
@echo ""
+ @echo " Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
+ @echo ""
+ @echo ""
@echo "Project Files for IDE's"
@echo " * project_qtcreator - QtCreator Project Files"
@echo " * project_netbeans - NetBeans Project Files"
@@ -130,9 +136,8 @@
@echo " * package_pacman - build an arch linux pacmanpackage"
@echo " * package_archive - build an archive package"
@echo ""
- @echo "Other Targets"
+ @echo "Other Targets (not assosiated with building blender)"
@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"
@@ -145,8 +150,10 @@
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo ""
- @echo "Documentation Targets"
+ @echo "Documentation Targets (not assosiated with building blender)"
@echo " * doc_py - generate sphinx python api docs"
+ @echo " * doc_dna - generate blender file format reference"
+ @echo " * doc_man - generate manpage"
@echo ""
# -----------------------------------------------------------------------------
@@ -233,9 +240,16 @@
doc_py:
$(BUILD_DIR)/bin/blender --background --factory-startup --python doc/python_api/sphinx_doc_gen.py
cd doc/python_api ; sphinx-build -n -b html sphinx-in sphinx-out
- @echo "docs written into: 'doc/python_api/sphinx-out/index.html'"
+ @echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
+doc_dna:
+ $(BUILD_DIR)/bin/blender --background --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
+ @echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
+doc_man:
+ python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/bmesh/blender/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/Modules/FindGLEW.cmake 2011-10-17 03:23:10 UTC (rev 41076)
+++ branches/bmesh/blender/build_files/cmake/Modules/FindGLEW.cmake 2011-10-17 03:40:10 UTC (rev 41077)
@@ -51,9 +51,9 @@
ENDIF (WIN32)
IF (GLEW_INCLUDE_PATH)
- SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+ SET(GLEW_FOUND TRUE)
ELSE (GLEW_INCLUDE_PATH)
- SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+ SET(GLEW_FOUND FALSE)
ENDIF (GLEW_INCLUDE_PATH)
MARK_AS_ADVANCED( GLEW_FOUND )
Modified: branches/bmesh/blender/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/RpmBuild.cmake 2011-10-17 03:23:10 UTC (rev 41076)
+++ branches/bmesh/blender/build_files/cmake/RpmBuild.cmake 2011-10-17 03:40:10 UTC (rev 41077)
@@ -3,17 +3,24 @@
# Authors: Rohit Yadav <rohityadav89 at gmail.com>
#
-find_program(RPMBUILD
- NAMES rpmbuild
- PATHS "/usr/bin")
+if(NOT DEFINED RPMBUILD)
-mark_as_advanced(RPMBUILD)
+ find_program(RPMBUILD
+ NAMES rpmbuild
+ PATHS "/usr/bin")
+ mark_as_advanced(RPMBUILD)
+
+ if(RPMBUILD)
+ message(STATUS "RPM Build Found: ${RPMBUILD}")
+ else(RPMBUILD)
+ message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
+ endif()
+
+endif()
+
if(RPMBUILD)
- get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
- message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
- set(RPMBUILD_FOUND "YES")
+ set(RPMBUILD_FOUND TRUE)
else(RPMBUILD)
- message(STATUS "rpmbuild NOT found. RPM generation will not be available")
- set(RPMBUILD_FOUND "NO")
-endif()
+ set(RPMBUILD_FOUND FALSE)
+endif()
\ No newline at end of file
Modified: branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py 2011-10-17 03:23:10 UTC (rev 41076)
+++ branches/bmesh/blender/build_files/cmake/cmake_consistency_check_config.py 2011-10-17 03:40:10 UTC (rev 41077)
@@ -27,6 +27,10 @@
"extern/eltopo/common/openglutils.cpp",
"extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp",
"source/blender/imbuf/intern/imbuf_cocoa.m",
+ "extern/recastnavigation/Recast/Source/RecastLog.cpp",
+ "extern/recastnavigation/Recast/Source/RecastTimer.cpp",
+ "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
+ "entern/audaspace/SRC/AUD_SRCResampleReader.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -50,6 +54,10 @@
"source/blender/bmesh/tools/BME_duplicate.c",
"source/blender/bmesh/tools/BME_extrude.c",
"source/blender/bmesh/tools/BME_weld.c",
+ "extern/recastnavigation/Recast/Include/RecastLog.h",
+ "extern/recastnavigation/Recast/Include/RecastTimer.h",
+ "intern/audaspace/SRC/AUD_SRCResampleFactory.h",
+ "intern/audaspace/SRC/AUD_SRCResampleReader.h",
)
UTF8_CHECK = True
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-10-17 03:23:10 UTC (rev 41076)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-10-17 03:40:10 UTC (rev 41077)
@@ -582,6 +582,20 @@
commands.getoutput(cmd)
cmd = 'find %s/%s.app -name __MACOSX -exec rm -rf {} \;'%(installdir, binary)
commands.getoutput(cmd)
+ if env['CC'].endswith('4.6.1'): # for correct errorhandling with gcc 4.6.1 we need the gcc.dylib to link, thus distribute in app-bundle
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/lib'%(installdir, binary)
+ commands.getoutput(cmd)
+ instname = env['BF_CXX']
+ cmd = 'cp %s/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/'%(instname, installdir, binary)
+ commands.getoutput(cmd)
+ cmd = 'install_name_tool -id @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/lib/libgcc_s.1.dylib'%(installdir, binary)
+ commands.getoutput(cmd)
+ cmd = 'install_name_tool -change %s/lib/libgcc_s.1.dylib @executable_path/lib/libgcc_s.1.dylib %s/%s.app/Contents/MacOS/%s'%(instname, installdir, binary, binary)
+ commands.getoutput(cmd)
+ cmd = 'rm -rf %s/set_simulation_threads.app'%(installdir) # first clear omp_num_threads applescript
+ commands.getoutput(cmd)
+ cmd = 'cp -R %s/source/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript
+ commands.getoutput(cmd)
# extract copy system python, be sure to update other build systems
# when making changes to the files that are copied.
Modified: branches/bmesh/blender/doc/manpage/blender.1.py
===================================================================
--- branches/bmesh/blender/doc/manpage/blender.1.py 2011-10-17 03:23:10 UTC (rev 41076)
+++ branches/bmesh/blender/doc/manpage/blender.1.py 2011-10-17 03:40:10 UTC (rev 41077)
@@ -22,6 +22,7 @@
import subprocess
import os
+import sys
import time
import datetime
@@ -43,11 +44,16 @@
return data
+# allow passing blender as argument
+if sys.argv[-1].endswith(os.sep + "blender"):
+ blender_bin = sys.argv[-1]
+else:
+ blender_bin = os.path.join(os.path.dirname(__file__), "../../blender.bin")
-blender_bin = os.path.join(os.path.dirname(__file__), "../../blender.bin")
+cmd = [blender_bin, "--help"]
+print(" executing:", " ".join(cmd))
+blender_help = subprocess.Popen(cmd, stdout=subprocess.PIPE).communicate()[0].decode()
-blender_help = subprocess.Popen([blender_bin, "--help"], stdout=subprocess.PIPE).communicate()[0].decode()
-
blender_version = subprocess.Popen([blender_bin, "--version"], stdout=subprocess.PIPE).communicate()[0].decode().strip()
blender_version = blender_version.split("Build")[0]
Copied: branches/bmesh/blender/doc/python_api/examples/mathutils.Color.py (from rev 41075, trunk/blender/doc/python_api/examples/mathutils.Color.py)
===================================================================
--- branches/bmesh/blender/doc/python_api/examples/mathutils.Color.py (rev 0)
+++ branches/bmesh/blender/doc/python_api/examples/mathutils.Color.py 2011-10-17 03:40:10 UTC (rev 41077)
@@ -0,0 +1,30 @@
+import mathutils
+
+# color values are represented as RGB values from 0 - 1, this is blue
+col = mathutils.Color((0.0, 0.0, 1.0))
+
+# as well as r/g/b attribute access you can adjust them by h/s/v
+col.s *= 0.5
+
+# you can access its components by attribute or index
+print("Color R:", col.r)
+print("Color G:", col[1])
+print("Color B:", col[-1])
+print("Color HSV: %.2f, %.2f, %.2f", col[:])
+
+
+# components of an existing color can be set
+col[:] = 0.0, 0.5, 1.0
+
+# components of an existing color can use slice notation to get a tuple
+print("Values: %f, %f, %f" % col[:])
+
+# colors can be added and subtracted
+col += mathutils.Color((0.25, 0.0, 0.0))
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list