[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41234] branches/bmesh/blender: svn merge ^/trunk/blender -r41100:41150
Campbell Barton
ideasman42 at gmail.com
Mon Oct 24 06:18:31 CEST 2011
Revision: 41234
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41234
Author: campbellbarton
Date: 2011-10-24 04:18:28 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41100:41150
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41100
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/bmesh/blender/doc/blender_file_format/README
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.sh
branches/bmesh/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/bmesh/blender/intern/ghost/GHOST_Types.h
branches/bmesh/blender/intern/ghost/intern/GHOST_EventKey.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.h
branches/bmesh/blender/intern/tools/dump_rna2xml.py
branches/bmesh/blender/release/scripts/presets/interaction/blender.py
branches/bmesh/blender/release/scripts/startup/bl_operators/anim.py
branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
branches/bmesh/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenkernel/BKE_font.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/BKE_packedFile.h
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenkernel/intern/BME_conversions.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_eulers.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_mesh.c
branches/bmesh/blender/source/blender/blenkernel/intern/BME_structure.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/font.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c
branches/bmesh/blender/source/blender/blenkernel/intern/nla.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/packedFile.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/property.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
branches/bmesh/blender/source/blender/blenkernel/intern/sound.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenlib/BLI_blenlib.h
branches/bmesh/blender/source/blender/blenlib/BLI_ghash.h
branches/bmesh/blender/source/blender/blenlib/BLI_string.h
branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h
branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
branches/bmesh/blender/source/blender/blenlib/intern/BLI_args.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/bmesh/blender/source/blender/blenlib/intern/fileops.c
branches/bmesh/blender/source/blender/blenlib/intern/freetypefont.c
branches/bmesh/blender/source/blender/blenlib/intern/storage.c
branches/bmesh/blender/source/blender/blenlib/intern/string_utf8.c
branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
branches/bmesh/blender/source/blender/blenloader/BLO_runtime.h
branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/runtime.c
branches/bmesh/blender/source/blender/collada/AnimationImporter.cpp
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/armature/poselib.c
branches/bmesh/blender/source/blender/editors/armature/poseobject.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/gpencil/editaction_gpencil.c
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_draw.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_templates.c
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/editors/object/object_constraint.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_hook.c
branches/bmesh/blender/source/blender/editors/object/object_relations.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/editors/render/render_internal.c
branches/bmesh/blender/source/blender/editors/render/render_preview.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/screen/screendump.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/bmesh/blender/source/blender/editors/space_file/fsmenu.c
branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
branches/bmesh/blender/source/blender/editors/space_info/info_report.c
branches/bmesh/blender/source/blender/editors/space_logic/logic_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.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_text/space_text.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.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/imbuf/intern/indexer.c
branches/bmesh/blender/source/blender/makesdna/DNA_node_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_animation.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_boid.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_fluidsim.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_lattice.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.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_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.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/makesrna/intern/rna_world.c
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/bmesh/blender/source/blender/modifiers/intern/MOD_bevel.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_boolean_util.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_mask.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_solidify.c
branches/bmesh/blender/source/blender/nodes/composite/node_composite_tree.c
branches/bmesh/blender/source/blender/nodes/intern/node_common.c
branches/bmesh/blender/source/blender/nodes/intern/node_socket.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_tree.c
branches/bmesh/blender/source/blender/nodes/texture/node_texture_tree.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
branches/bmesh/blender/source/blender/python/generic/py_capi_utils.h
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/render/intern/source/renderdatabase.c
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/creator/CMakeLists.txt
branches/bmesh/blender/source/creator/creator.c
branches/bmesh/blender/source/darwin/blender.app/Contents/Info.plist
branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/bmesh/blender/source/gameengine/GameLogic/CMakeLists.txt
branches/bmesh/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/bmesh/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/bmesh/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/bmesh/blender/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
branches/bmesh/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/bmesh/blender/source/gameengine/GameLogic/SConscript
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/bmesh/blender/source/gameengine/Ketsji/BL_Action.cpp
branches/bmesh/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/bmesh/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/bmesh/blender/source/gameengine/Ketsji/SConscript
branches/bmesh/blender/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/bmesh/blender/source/tests/CMakeLists.txt
branches/bmesh/blender/source/tests/rna_info_dump.py
branches/bmesh/blender/source/tools/CTS/FBlender.py
branches/bmesh/blender/source/tools/compile_scripts.py
Added Paths:
-----------
branches/bmesh/blender/source/blender/blenlib/BLI_string_utf8.h
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
Removed Paths:
-------------
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
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-41099
+ /trunk/blender:39992-41150
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/CMakeLists.txt 2011-10-24 04:18:28 UTC (rev 41234)
@@ -213,6 +213,10 @@
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
+option(WITH_PYTHON_UI_INFO "Allow navigating to UI source from the context menu" OFF)
+mark_as_advanced(WITH_PYTHON_UI_INFO)
+
+
if(APPLE)
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
@@ -1326,6 +1330,10 @@
add_definitions(-DWITH_ASSERT_ABORT)
endif()
+if(WITH_PYTHON_UI_INFO)
+ add_definitions(-DWITH_PYTHON_UI_INFO)
+endif()
+
# message(STATUS "Using CFLAGS: ${CMAKE_C_FLAGS}")
# message(STATUS "Using CXXFLAGS: ${CMAKE_CXX_FLAGS}")
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/GNUmakefile 2011-10-24 04:18:28 UTC (rev 41234)
@@ -174,7 +174,7 @@
# Other Targets
#
translations:
- $(BUILD_DIR)/bin/blender --background --factory-startup --python po/update_msg.py
+ $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python po/update_msg.py
python3 po/update_pot.py
python3 po/update_po.py
python3 po/update_mo.py
@@ -238,12 +238,12 @@
# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
doc_py:
- $(BUILD_DIR)/bin/blender --background --factory-startup --python doc/python_api/sphinx_doc_gen.py
+ $(BUILD_DIR)/bin/blender --background -noaudio --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: '$(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
+ $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python doc/blender_file_format/BlendFileDnaExporter_25.py
@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
doc_man:
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-10-24 04:18:28 UTC (rev 41234)
@@ -316,8 +316,8 @@
if env['WITH_BF_TIFF']:
defs.append('WITH_TIFF')
- if not env['WITH_BF_SDL']:
- defs.append('DISABLE_SDL')
+ if env['WITH_BF_SDL']:
+ defs.append('WITH_SDL')
if env['WITH_BF_PYTHON']:
incs.append('#/source/blender/python')
Modified: branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py
===================================================================
--- branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/doc/blender_file_format/BlendFileDnaExporter_25.py 2011-10-24 04:18:28 UTC (rev 41234)
@@ -379,15 +379,15 @@
def usage():
- print("\nUsage: \n\tblender2.5 -b -P BlendFileDnaExporter_25.py [-- [options]]")
+ print("\nUsage: \n\tblender2.5 --background -noaudio --python BlendFileDnaExporter_25.py [-- [options]]")
print("Options:")
print("\t--dna-keep-blend: doesn't delete the produced blend file DNA export to html")
print("\t--dna-debug: sets the logging level to DEBUG (lots of additional info)")
print("\t--dna-versioned saves version informations in the html and blend filenames")
print("\t--dna-overwrite-css overwrite dna.css, useful when modifying css in the script")
print("Examples:")
- print("\tdefault: % blender2.5 -b -P BlendFileDnaExporter_25.py")
- print("\twith options: % blender2.5 -b -P BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug\n")
+ print("\tdefault: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py")
+ print("\twith options: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug\n")
######################################################
Modified: branches/bmesh/blender/doc/blender_file_format/README
===================================================================
--- branches/bmesh/blender/doc/blender_file_format/README 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/doc/blender_file_format/README 2011-10-24 04:18:28 UTC (rev 41234)
@@ -16,14 +16,14 @@
Usage:
- blender2.5 -b -P BlendFileDnaExporter_25.py [-- [options]]
+ blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py [-- [options]]
Options:
--dna-keep-blend: doesn't delete the produced blend file DNA export to html
--dna-debug: sets the logging level to DEBUG (lots of additional info)
--dna-versioned saves version informations in the html and blend filenames
--dna-overwrite-css overwrite dna.css, useful when modifying css in the script
Examples:
- default: % blender2.5 -b -P BlendFileDnaExporter_25.py
- with options: % blender2.5 -b -P BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug
+ default: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py
+ with options: % blender2.5 --background -noaudio --python BlendFileDnaExporter_25.py -- --dna-keep-blend --dna-debug
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-10-24 04:18:28 UTC (rev 41234)
@@ -27,7 +27,7 @@
-------------------
- Run this script from blenders root path once you have compiled blender
- ./blender.bin --background --python doc/python_api/sphinx_doc_gen.py
+ ./blender.bin --background -noaudio --python doc/python_api/sphinx_doc_gen.py
This will generate python files in doc/python_api/sphinx-in/
providing ./blender.bin is or links to the blender executable
@@ -94,7 +94,7 @@
# for quick rebuilds
"""
rm -rf /b/doc/python_api/sphinx-* && \
-./blender.bin --background --factory-startup --python doc/python_api/sphinx_doc_gen.py && \
+./blender.bin --background -noaudio --factory-startup --python doc/python_api/sphinx_doc_gen.py && \
sphinx-build doc/python_api/sphinx-in doc/python_api/sphinx-out
"""
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.sh
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.sh 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.sh 2011-10-24 04:18:28 UTC (rev 41234)
@@ -48,7 +48,7 @@
if $DO_EXE_BLENDER ; then
# dont delete existing docs, now partial updates are used for quick builds.
- $BLENDER --background --factory-startup --python $SPHINXBASE/sphinx_doc_gen.py
+ $BLENDER --background -noaudio --factory-startup --python $SPHINXBASE/sphinx_doc_gen.py
fi
Modified: branches/bmesh/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
===================================================================
--- branches/bmesh/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp 2011-10-24 04:18:28 UTC (rev 41234)
@@ -352,7 +352,7 @@
0.0f * M_PI / 180.0f,
0.0f * M_PI / 180.0f,
-110.0f * M_PI / 180.0f,
- 110.0f * M_PI / 180.0f
+ 110.0f * M_PI / 180.0f,
-150.0f * M_PI / 180.0f,
150.0f * M_PI / 180.0f
};
Modified: branches/bmesh/blender/intern/ghost/GHOST_Types.h
===================================================================
--- branches/bmesh/blender/intern/ghost/GHOST_Types.h 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/intern/ghost/GHOST_Types.h 2011-10-24 04:18:28 UTC (rev 41234)
@@ -468,6 +468,7 @@
GHOST_TKey key;
/** The ascii code for the key event ('\0' if none). */
char ascii;
+ char utf8_buf[6];
} GHOST_TEventKeyData;
typedef struct {
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_EventKey.h
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_EventKey.h 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_EventKey.h 2011-10-24 04:18:28 UTC (rev 41234)
@@ -55,6 +55,7 @@
{
m_keyEventData.key = key;
m_keyEventData.ascii = '\0';
+ m_keyEventData.utf8_buf[0]= '\0';
m_data = &m_keyEventData;
}
@@ -65,11 +66,13 @@
* @param key The key code of the key.
* @param ascii The ascii code for the key event.
*/
- GHOST_EventKey(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow* window, GHOST_TKey key, char ascii)
+ GHOST_EventKey(GHOST_TUns64 msec, GHOST_TEventType type, GHOST_IWindow* window, GHOST_TKey key, char ascii, const char utf8_buf[6])
: GHOST_Event(msec, type, window)
{
m_keyEventData.key = key;
m_keyEventData.ascii = ascii;
+ if (utf8_buf) memcpy(m_keyEventData.utf8_buf, utf8_buf, sizeof(m_keyEventData.utf8_buf));
+ else m_keyEventData.utf8_buf[0]= '\0';
m_data = &m_keyEventData;
}
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-10-23 22:21:55 UTC (rev 41233)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-10-24 04:18:28 UTC (rev 41234)
@@ -931,7 +931,7 @@
} else {
type = GHOST_kEventKeyUp;
}
- pushEvent( new GHOST_EventKey( getMilliSeconds(), type, window, key, ascii) );
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list