[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41183] branches/cycles: Cycles: svn merge -r40934:41157 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Oct 21 22:13:14 CEST 2011
Revision: 41183
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41183
Author: blendix
Date: 2011-10-21 20:13:12 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Cycles: svn merge -r40934:41157 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40934
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/GNUmakefile
branches/cycles/build_files/cmake/Modules/FindGLEW.cmake
branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/cycles/build_files/cmake/RpmBuild.cmake
branches/cycles/build_files/cmake/cmake_consistency_check_config.py
branches/cycles/build_files/scons/tools/Blender.py
branches/cycles/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/cycles/doc/blender_file_format/README
branches/cycles/doc/build_systems/scons-dev.txt
branches/cycles/doc/manpage/blender.1
branches/cycles/doc/manpage/blender.1.py
branches/cycles/doc/python_api/examples/mathutils.Euler.py
branches/cycles/doc/python_api/examples/mathutils.Matrix.py
branches/cycles/doc/python_api/examples/mathutils.Quaternion.py
branches/cycles/doc/python_api/rst/bge.logic.rst
branches/cycles/doc/python_api/rst/bgl.rst
branches/cycles/doc/python_api/rst/gpu.rst
branches/cycles/doc/python_api/rst/info_best_practice.rst
branches/cycles/doc/python_api/rst/info_gotcha.rst
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/doc/python_api/sphinx_doc_gen.sh
branches/cycles/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/cycles/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/cycles/intern/audaspace/intern/AUD_C-API.cpp
branches/cycles/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/cycles/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/cycles/intern/ghost/GHOST_Types.h
branches/cycles/intern/ghost/intern/GHOST_EventKey.h
branches/cycles/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/cycles/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemSDL.h
branches/cycles/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemX11.cpp
branches/cycles/intern/ghost/intern/GHOST_SystemX11.h
branches/cycles/intern/ghost/intern/GHOST_WindowSDL.h
branches/cycles/intern/ghost/intern/GHOST_WindowX11.cpp
branches/cycles/intern/ghost/intern/GHOST_WindowX11.h
branches/cycles/intern/tools/credits_svn_gen.py
branches/cycles/intern/tools/dump_rna2xml.py
branches/cycles/po/es.po
branches/cycles/po/fr.po
branches/cycles/po/update_msg.py
branches/cycles/po/zh_CN.po
branches/cycles/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/cycles/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/cycles/release/datafiles/splash.png
branches/cycles/release/scripts/modules/addon_utils.py
branches/cycles/release/scripts/modules/animsys_refactor.py
branches/cycles/release/scripts/modules/blend_render_info.py
branches/cycles/release/scripts/modules/bpy/__init__.py
branches/cycles/release/scripts/modules/bpy/ops.py
branches/cycles/release/scripts/modules/bpy/utils.py
branches/cycles/release/scripts/modules/bpy_extras/anim_utils.py
branches/cycles/release/scripts/modules/bpy_extras/image_utils.py
branches/cycles/release/scripts/modules/bpy_extras/io_utils.py
branches/cycles/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/cycles/release/scripts/modules/bpy_extras/mesh_utils.py
branches/cycles/release/scripts/modules/bpy_extras/object_utils.py
branches/cycles/release/scripts/modules/bpy_extras/view3d_utils.py
branches/cycles/release/scripts/modules/bpy_types.py
branches/cycles/release/scripts/modules/console_python.py
branches/cycles/release/scripts/modules/console_shell.py
branches/cycles/release/scripts/modules/rna_info.py
branches/cycles/release/scripts/presets/interaction/blender.py
branches/cycles/release/scripts/startup/bl_operators/anim.py
branches/cycles/release/scripts/startup/bl_operators/console.py
branches/cycles/release/scripts/startup/bl_operators/object.py
branches/cycles/release/scripts/startup/bl_operators/presets.py
branches/cycles/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/cycles/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/cycles/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/cycles/release/scripts/startup/bl_operators/view3d.py
branches/cycles/release/scripts/startup/bl_operators/wm.py
branches/cycles/release/scripts/startup/bl_ui/properties_animviz.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_armature.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_bone.py
branches/cycles/release/scripts/startup/bl_ui/properties_data_curve.py
branches/cycles/release/scripts/startup/bl_ui/properties_material.py
branches/cycles/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/cycles/release/scripts/startup/bl_ui/properties_particle.py
branches/cycles/release/scripts/startup/bl_ui/properties_physics_common.py
branches/cycles/release/scripts/startup/bl_ui/properties_texture.py
branches/cycles/release/scripts/startup/bl_ui/space_logic.py
branches/cycles/release/scripts/startup/bl_ui/space_sequencer.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref.py
branches/cycles/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/release/scripts/templates/gamelogic_module.py
branches/cycles/scons/scons.py
branches/cycles/source/blender/blenfont/intern/blf_font.c
branches/cycles/source/blender/blenkernel/BKE_animsys.h
branches/cycles/source/blender/blenkernel/BKE_blender.h
branches/cycles/source/blender/blenkernel/BKE_font.h
branches/cycles/source/blender/blenkernel/BKE_node.h
branches/cycles/source/blender/blenkernel/BKE_packedFile.h
branches/cycles/source/blender/blenkernel/BKE_paint.h
branches/cycles/source/blender/blenkernel/BKE_utildefines.h
branches/cycles/source/blender/blenkernel/SConscript
branches/cycles/source/blender/blenkernel/intern/BME_conversions.c
branches/cycles/source/blender/blenkernel/intern/BME_eulers.c
branches/cycles/source/blender/blenkernel/intern/BME_mesh.c
branches/cycles/source/blender/blenkernel/intern/BME_structure.c
branches/cycles/source/blender/blenkernel/intern/anim.c
branches/cycles/source/blender/blenkernel/intern/cloth.c
branches/cycles/source/blender/blenkernel/intern/constraint.c
branches/cycles/source/blender/blenkernel/intern/depsgraph.c
branches/cycles/source/blender/blenkernel/intern/fcurve.c
branches/cycles/source/blender/blenkernel/intern/font.c
branches/cycles/source/blender/blenkernel/intern/gpencil.c
branches/cycles/source/blender/blenkernel/intern/image.c
branches/cycles/source/blender/blenkernel/intern/ipo.c
branches/cycles/source/blender/blenkernel/intern/material.c
branches/cycles/source/blender/blenkernel/intern/modifier.c
branches/cycles/source/blender/blenkernel/intern/nla.c
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/blenkernel/intern/packedFile.c
branches/cycles/source/blender/blenkernel/intern/particle.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/pointcache.c
branches/cycles/source/blender/blenkernel/intern/property.c
branches/cycles/source/blender/blenkernel/intern/seqeffects.c
branches/cycles/source/blender/blenkernel/intern/sequencer.c
branches/cycles/source/blender/blenkernel/intern/smoke.c
branches/cycles/source/blender/blenkernel/intern/softbody.c
branches/cycles/source/blender/blenkernel/intern/sound.c
branches/cycles/source/blender/blenkernel/intern/texture.c
branches/cycles/source/blender/blenlib/BLI_blenlib.h
branches/cycles/source/blender/blenlib/BLI_ghash.h
branches/cycles/source/blender/blenlib/BLI_path_util.h
branches/cycles/source/blender/blenlib/BLI_string.h
branches/cycles/source/blender/blenlib/BLI_utildefines.h
branches/cycles/source/blender/blenlib/CMakeLists.txt
branches/cycles/source/blender/blenlib/intern/BLI_args.c
branches/cycles/source/blender/blenlib/intern/BLI_ghash.c
branches/cycles/source/blender/blenlib/intern/bpath.c
branches/cycles/source/blender/blenlib/intern/fileops.c
branches/cycles/source/blender/blenlib/intern/freetypefont.c
branches/cycles/source/blender/blenlib/intern/path_util.c
branches/cycles/source/blender/blenlib/intern/storage.c
branches/cycles/source/blender/blenlib/intern/string_utf8.c
branches/cycles/source/blender/blenlib/intern/winstuff.c
branches/cycles/source/blender/blenloader/BLO_readfile.h
branches/cycles/source/blender/blenloader/BLO_runtime.h
branches/cycles/source/blender/blenloader/intern/readblenentry.c
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/runtime.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/collada/AnimationImporter.cpp
branches/cycles/source/blender/collada/DocumentImporter.cpp
branches/cycles/source/blender/collada/ImageExporter.cpp
branches/cycles/source/blender/editors/animation/anim_channels_edit.c
branches/cycles/source/blender/editors/animation/anim_filter.c
branches/cycles/source/blender/editors/armature/editarmature.c
branches/cycles/source/blender/editors/armature/poselib.c
branches/cycles/source/blender/editors/armature/poseobject.c
branches/cycles/source/blender/editors/curve/editfont.c
branches/cycles/source/blender/editors/datafiles/splash.png.c
branches/cycles/source/blender/editors/gpencil/drawgpencil.c
branches/cycles/source/blender/editors/gpencil/editaction_gpencil.c
branches/cycles/source/blender/editors/include/ED_anim_api.h
branches/cycles/source/blender/editors/include/ED_fileselect.h
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_anim.c
branches/cycles/source/blender/editors/interface/interface_draw.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_intern.h
branches/cycles/source/blender/editors/interface/interface_node.c
branches/cycles/source/blender/editors/interface/interface_regions.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/resources.c
branches/cycles/source/blender/editors/mesh/editmesh_lib.c
branches/cycles/source/blender/editors/mesh/meshtools.c
branches/cycles/source/blender/editors/object/object_constraint.c
branches/cycles/source/blender/editors/object/object_edit.c
branches/cycles/source/blender/editors/object/object_hook.c
branches/cycles/source/blender/editors/object/object_modifier.c
branches/cycles/source/blender/editors/object/object_relations.c
branches/cycles/source/blender/editors/object/object_vgroup.c
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/render/render_internal.c
branches/cycles/source/blender/editors/render/render_preview.c
branches/cycles/source/blender/editors/render/render_shading.c
branches/cycles/source/blender/editors/screen/screen_ops.c
branches/cycles/source/blender/editors/screen/screendump.c
branches/cycles/source/blender/editors/sculpt_paint/paint_image.c
branches/cycles/source/blender/editors/sculpt_paint/paint_vertex.c
branches/cycles/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/cycles/source/blender/editors/sound/sound_ops.c
branches/cycles/source/blender/editors/space_action/action_edit.c
branches/cycles/source/blender/editors/space_buttons/buttons_ops.c
branches/cycles/source/blender/editors/space_file/file_draw.c
branches/cycles/source/blender/editors/space_file/file_ops.c
branches/cycles/source/blender/editors/space_file/filelist.c
branches/cycles/source/blender/editors/space_file/filesel.c
branches/cycles/source/blender/editors/space_file/fsmenu.c
branches/cycles/source/blender/editors/space_graph/graph_draw.c
branches/cycles/source/blender/editors/space_image/image_buttons.c
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_info/info_report.c
branches/cycles/source/blender/editors/space_logic/logic_ops.c
branches/cycles/source/blender/editors/space_node/node_draw.c
branches/cycles/source/blender/editors/space_node/node_edit.c
branches/cycles/source/blender/editors/space_node/space_node.c
branches/cycles/source/blender/editors/space_outliner/outliner_edit.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_add.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_draw.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_edit.c
branches/cycles/source/blender/editors/space_sequencer/sequencer_select.c
branches/cycles/source/blender/editors/space_sequencer/space_sequencer.c
branches/cycles/source/blender/editors/space_text/space_text.c
branches/cycles/source/blender/editors/space_text/text_ops.c
branches/cycles/source/blender/editors/space_view3d/drawarmature.c
branches/cycles/source/blender/editors/space_view3d/drawobject.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_fly.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_input.c
branches/cycles/source/blender/editors/util/crazyspace.c
branches/cycles/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/cycles/source/blender/imbuf/intern/IMB_indexer.h
branches/cycles/source/blender/imbuf/intern/anim_movie.c
branches/cycles/source/blender/imbuf/intern/indexer.c
branches/cycles/source/blender/makesdna/DNA_action_types.h
branches/cycles/source/blender/makesdna/DNA_constraint_types.h
branches/cycles/source/blender/makesdna/DNA_gpencil_types.h
branches/cycles/source/blender/makesdna/DNA_ipo_types.h
branches/cycles/source/blender/makesdna/DNA_node_types.h
branches/cycles/source/blender/makesdna/DNA_object_types.h
branches/cycles/source/blender/makesdna/DNA_particle_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesrna/intern/rna_action.c
branches/cycles/source/blender/makesrna/intern/rna_actuator.c
branches/cycles/source/blender/makesrna/intern/rna_animation.c
branches/cycles/source/blender/makesrna/intern/rna_boid.c
branches/cycles/source/blender/makesrna/intern/rna_curve.c
branches/cycles/source/blender/makesrna/intern/rna_define.c
branches/cycles/source/blender/makesrna/intern/rna_fcurve.c
branches/cycles/source/blender/makesrna/intern/rna_fluidsim.c
branches/cycles/source/blender/makesrna/intern/rna_gpencil.c
branches/cycles/source/blender/makesrna/intern/rna_image.c
branches/cycles/source/blender/makesrna/intern/rna_image_api.c
branches/cycles/source/blender/makesrna/intern/rna_lattice.c
branches/cycles/source/blender/makesrna/intern/rna_mesh.c
branches/cycles/source/blender/makesrna/intern/rna_modifier.c
branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
branches/cycles/source/blender/makesrna/intern/rna_object.c
branches/cycles/source/blender/makesrna/intern/rna_object_force.c
branches/cycles/source/blender/makesrna/intern/rna_particle.c
branches/cycles/source/blender/makesrna/intern/rna_pose.c
branches/cycles/source/blender/makesrna/intern/rna_render.c
branches/cycles/source/blender/makesrna/intern/rna_rna.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
branches/cycles/source/blender/makesrna/intern/rna_smoke.c
branches/cycles/source/blender/makesrna/intern/rna_space.c
branches/cycles/source/blender/makesrna/intern/rna_texture.c
branches/cycles/source/blender/makesrna/intern/rna_ui.c
branches/cycles/source/blender/makesrna/intern/rna_userdef.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/makesrna/intern/rna_world.c
branches/cycles/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/cycles/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/cycles/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/cycles/source/blender/modifiers/intern/MOD_bevel.c
branches/cycles/source/blender/modifiers/intern/MOD_boolean_util.c
branches/cycles/source/blender/modifiers/intern/MOD_mask.c
branches/cycles/source/blender/modifiers/intern/MOD_screw.c
branches/cycles/source/blender/modifiers/intern/MOD_simpledeform.c
branches/cycles/source/blender/modifiers/intern/MOD_solidify.c
branches/cycles/source/blender/nodes/composite/node_composite_tree.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_image.c
branches/cycles/source/blender/nodes/intern/node_common.c
branches/cycles/source/blender/nodes/intern/node_exec.c
branches/cycles/source/blender/nodes/intern/node_socket.c
branches/cycles/source/blender/nodes/shader/node_shader_tree.c
branches/cycles/source/blender/nodes/texture/node_texture_tree.c
branches/cycles/source/blender/python/generic/IDProp.c
branches/cycles/source/blender/python/generic/bgl.c
branches/cycles/source/blender/python/generic/bpy_internal_import.c
branches/cycles/source/blender/python/generic/noise_py_api.c
branches/cycles/source/blender/python/generic/py_capi_utils.c
branches/cycles/source/blender/python/generic/py_capi_utils.h
branches/cycles/source/blender/python/intern/bpy.c
branches/cycles/source/blender/python/intern/bpy_app.c
branches/cycles/source/blender/python/intern/bpy_app_handlers.c
branches/cycles/source/blender/python/intern/bpy_driver.c
branches/cycles/source/blender/python/intern/bpy_interface.c
branches/cycles/source/blender/python/intern/bpy_interface_atexit.c
branches/cycles/source/blender/python/intern/bpy_library.c
branches/cycles/source/blender/python/intern/bpy_operator.c
branches/cycles/source/blender/python/intern/bpy_operator_wrap.c
branches/cycles/source/blender/python/intern/bpy_props.c
branches/cycles/source/blender/python/intern/bpy_rna.c
branches/cycles/source/blender/python/intern/bpy_rna.h
branches/cycles/source/blender/python/intern/bpy_rna_anim.c
branches/cycles/source/blender/python/intern/bpy_rna_array.c
branches/cycles/source/blender/python/intern/bpy_traceback.c
branches/cycles/source/blender/python/intern/bpy_util.c
branches/cycles/source/blender/python/intern/gpu.c
branches/cycles/source/blender/python/mathutils/mathutils.c
branches/cycles/source/blender/python/mathutils/mathutils_Color.c
branches/cycles/source/blender/python/mathutils/mathutils_Euler.c
branches/cycles/source/blender/python/mathutils/mathutils_Matrix.c
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cycles/source/blender/python/mathutils/mathutils_Vector.c
branches/cycles/source/blender/python/mathutils/mathutils_geometry.c
branches/cycles/source/blender/render/intern/include/raycounter.h
branches/cycles/source/blender/render/intern/raytrace/bvh.h
branches/cycles/source/blender/render/intern/source/pipeline.c
branches/cycles/source/blender/render/intern/source/renderdatabase.c
branches/cycles/source/blender/windowmanager/WM_types.h
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/creator/creator.c
branches/cycles/source/darwin/blender.app/Contents/Info.plist
branches/cycles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/cycles/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/Expressions/ConstExpr.cpp
branches/cycles/source/gameengine/GameLogic/CMakeLists.txt
branches/cycles/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/cycles/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/cycles/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/cycles/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
branches/cycles/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/cycles/source/gameengine/GameLogic/SConscript
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cycles/source/gameengine/Ketsji/BL_Action.cpp
branches/cycles/source/gameengine/Ketsji/CMakeLists.txt
branches/cycles/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/cycles/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/cycles/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/cycles/source/gameengine/Ketsji/SConscript
branches/cycles/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/cycles/source/tests/CMakeLists.txt
branches/cycles/source/tests/rna_info_dump.py
branches/cycles/source/tools/CTS/FBlender.py
branches/cycles/source/tools/compile_scripts.py
Added Paths:
-----------
branches/cycles/doc/python_api/examples/mathutils.Color.py
branches/cycles/release/scripts/templates/driver_functions.py
branches/cycles/source/blender/blenlib/BLI_string_utf8.h
branches/cycles/source/darwin/set_simulation_threads.app/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/cycles/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/cycles/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/cycles/source/tools/spell_check_source.py
branches/cycles/source/tools/spell_check_source_config.py
Removed Paths:
-------------
branches/cycles/source/darwin/set_simulation_threads.app/Contents/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/cycles/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/cycles/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/cycles/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
Property Changed:
----------------
branches/cycles/
branches/cycles/intern/
branches/cycles/release/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41157
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/CMakeLists.txt 2011-10-21 20:13:12 UTC (rev 41183)
@@ -223,6 +223,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
@@ -862,7 +866,7 @@
set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
else()
- # keep GCC spesific stuff here
+ # keep GCC specific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
@@ -1452,6 +1456,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/cycles/GNUmakefile
===================================================================
--- branches/cycles/GNUmakefile 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/GNUmakefile 2011-10-21 20:13:12 UTC (rev 41183)
@@ -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,6 +150,11 @@
@echo " * check_splint - run blenders source through splint (C only)"
@echo " * check_sparse - run blenders source through sparse (C only)"
@echo ""
+ @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 ""
# -----------------------------------------------------------------------------
# Packages
@@ -164,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
@@ -222,6 +232,24 @@
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+# -----------------------------------------------------------------------------
+# Documentation
+#
+
+# Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
+doc_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 -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:
+ python3 doc/manpage/blender.1.py $(BUILD_DIR)/bin/blender
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/cycles/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- branches/cycles/build_files/cmake/Modules/FindGLEW.cmake 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/build_files/cmake/Modules/FindGLEW.cmake 2011-10-21 20:13:12 UTC (rev 41183)
@@ -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/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-10-21 20:13:12 UTC (rev 41183)
@@ -53,10 +53,11 @@
)
# Fedora openCOLLADA package links these statically
+# note that order is important here ot it wont link
SET(_opencollada_FIND_STATIC_COMPONENTS
+ buffer
+ ftoa
UTF
- ftoa
- buffer
)
SET(_opencollada_SEARCH_DIRS
Modified: branches/cycles/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/cycles/build_files/cmake/RpmBuild.cmake 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/build_files/cmake/RpmBuild.cmake 2011-10-21 20:13:12 UTC (rev 41183)
@@ -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/cycles/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/cycles/build_files/cmake/cmake_consistency_check_config.py 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/build_files/cmake/cmake_consistency_check_config.py 2011-10-21 20:13:12 UTC (rev 41183)
@@ -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",
@@ -41,6 +45,10 @@
"extern/eltopo/common/meshes/TriangleIndex.hpp",
"extern/eltopo/common/meshes/meshloader.h",
"extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
+ "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/cycles/build_files/scons/tools/Blender.py
===================================================================
--- branches/cycles/build_files/scons/tools/Blender.py 2011-10-21 19:09:14 UTC (rev 41182)
+++ branches/cycles/build_files/scons/tools/Blender.py 2011-10-21 20:13:12 UTC (rev 41183)
@@ -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')
@@ -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)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list