[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41200] branches/soc-2011-carrot: Merge with trunk r41197
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Sat Oct 22 18:43:24 CEST 2011
Revision: 41200
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41200
Author: miikah
Date: 2011-10-22 16:43:23 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Merge with trunk r41197
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41197
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/GNUmakefile
branches/soc-2011-carrot/SConstruct
branches/soc-2011-carrot/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-i686.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2011-carrot/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-carrot/build_files/cmake/Modules/FindGLEW.cmake
branches/soc-2011-carrot/build_files/cmake/RpmBuild.cmake
branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check_config.py
branches/soc-2011-carrot/build_files/scons/config/darwin-config.py
branches/soc-2011-carrot/build_files/scons/config/freebsd7-config.py
branches/soc-2011-carrot/build_files/scons/config/freebsd8-config.py
branches/soc-2011-carrot/build_files/scons/config/freebsd9-config.py
branches/soc-2011-carrot/build_files/scons/config/linux-config.py
branches/soc-2011-carrot/build_files/scons/config/linuxcross-config.py
branches/soc-2011-carrot/build_files/scons/config/win32-mingw-config.py
branches/soc-2011-carrot/build_files/scons/config/win32-vc-config.py
branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
branches/soc-2011-carrot/build_files/scons/tools/Blender.py
branches/soc-2011-carrot/build_files/scons/tools/btools.py
branches/soc-2011-carrot/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/soc-2011-carrot/doc/blender_file_format/README
branches/soc-2011-carrot/doc/manpage/blender.1
branches/soc-2011-carrot/doc/manpage/blender.1.py
branches/soc-2011-carrot/doc/python_api/examples/mathutils.Euler.py
branches/soc-2011-carrot/doc/python_api/examples/mathutils.Matrix.py
branches/soc-2011-carrot/doc/python_api/examples/mathutils.Quaternion.py
branches/soc-2011-carrot/doc/python_api/rst/bge.logic.rst
branches/soc-2011-carrot/doc/python_api/rst/bgl.rst
branches/soc-2011-carrot/doc/python_api/rst/info_best_practice.rst
branches/soc-2011-carrot/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-carrot/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
branches/soc-2011-carrot/intern/audaspace/FX/AUD_IIRFilterReader.cpp
branches/soc-2011-carrot/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2011-carrot/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
branches/soc-2011-carrot/intern/audaspace/intern/AUD_NULLDevice.cpp
branches/soc-2011-carrot/intern/ghost/GHOST_Types.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_EventKey.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemSDL.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowSDL.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2011-carrot/intern/ghost/test/multitest/MultiTest.c
branches/soc-2011-carrot/intern/memutil/MEM_SmartPtr.h
branches/soc-2011-carrot/intern/tools/credits_svn_gen.py
branches/soc-2011-carrot/intern/tools/dump_rna2xml.py
branches/soc-2011-carrot/po/README.txt
branches/soc-2011-carrot/po/es.po
branches/soc-2011-carrot/po/fr.po
branches/soc-2011-carrot/po/update_mo.py
branches/soc-2011-carrot/po/update_msg.py
branches/soc-2011-carrot/po/zh_CN.po
branches/soc-2011-carrot/release/scripts/modules/addon_utils.py
branches/soc-2011-carrot/release/scripts/modules/animsys_refactor.py
branches/soc-2011-carrot/release/scripts/modules/blend_render_info.py
branches/soc-2011-carrot/release/scripts/modules/bpy/__init__.py
branches/soc-2011-carrot/release/scripts/modules/bpy/ops.py
branches/soc-2011-carrot/release/scripts/modules/bpy/utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/anim_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_types.py
branches/soc-2011-carrot/release/scripts/modules/console_python.py
branches/soc-2011-carrot/release/scripts/modules/console_shell.py
branches/soc-2011-carrot/release/scripts/modules/rna_info.py
branches/soc-2011-carrot/release/scripts/presets/interaction/blender.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/anim.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/console.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_animviz.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/release/scripts/templates/gamelogic_module.py
branches/soc-2011-carrot/scons/scons.py
branches/soc-2011-carrot/source/blender/blenfont/BLF_translation.h
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_dir.c
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_internal.h
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_lang.c
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_translation.c
branches/soc-2011-carrot/source/blender/blenfont/intern/blf_util.c
branches/soc-2011-carrot/source/blender/blenkernel/BKE_animsys.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_font.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_node.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_packedFile.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2011-carrot/source/blender/blenkernel/SConscript
branches/soc-2011-carrot/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/BME_eulers.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/BME_mesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/BME_structure.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/blender.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/effect.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/font.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/image.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/key.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/nla.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/packedFile.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/pointcache.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/property.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/softbody.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sound.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-carrot/source/blender/blenlib/BLI_blenlib.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_edgehash.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_fileops.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_mempool.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_scanfill.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_string.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-carrot/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-carrot/source/blender/blenlib/PIL_time.h
branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_args.c
branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-carrot/source/blender/blenlib/intern/bpath.c
branches/soc-2011-carrot/source/blender/blenlib/intern/fileops.c
branches/soc-2011-carrot/source/blender/blenlib/intern/freetypefont.c
branches/soc-2011-carrot/source/blender/blenlib/intern/path_util.c
branches/soc-2011-carrot/source/blender/blenlib/intern/string_utf8.c
branches/soc-2011-carrot/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-carrot/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-carrot/source/blender/blenloader/BLO_runtime.h
branches/soc-2011-carrot/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
branches/soc-2011-carrot/source/blender/blenloader/intern/runtime.c
branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
branches/soc-2011-carrot/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-carrot/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-carrot/source/blender/collada/ImageExporter.cpp
branches/soc-2011-carrot/source/blender/collada/collada.cpp
branches/soc-2011-carrot/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_filter.c
branches/soc-2011-carrot/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2011-carrot/source/blender/editors/armature/editarmature.c
branches/soc-2011-carrot/source/blender/editors/armature/poselib.c
branches/soc-2011-carrot/source/blender/editors/armature/poseobject.c
branches/soc-2011-carrot/source/blender/editors/curve/editfont.c
branches/soc-2011-carrot/source/blender/editors/gpencil/editaction_gpencil.c
branches/soc-2011-carrot/source/blender/editors/include/ED_anim_api.h
branches/soc-2011-carrot/source/blender/editors/include/ED_fileselect.h
branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
branches/soc-2011-carrot/source/blender/editors/interface/interface.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_anim.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_icons.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
branches/soc-2011-carrot/source/blender/editors/interface/interface_layout.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_panel.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_regions.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_utils.c
branches/soc-2011-carrot/source/blender/editors/interface/resources.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2011-carrot/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2011-carrot/source/blender/editors/mesh/meshtools.c
branches/soc-2011-carrot/source/blender/editors/object/object_constraint.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_hook.c
branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
branches/soc-2011-carrot/source/blender/editors/object/object_vgroup.c
branches/soc-2011-carrot/source/blender/editors/physics/particle_edit.c
branches/soc-2011-carrot/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-carrot/source/blender/editors/render/render_internal.c
branches/soc-2011-carrot/source/blender/editors/render/render_preview.c
branches/soc-2011-carrot/source/blender/editors/render/render_shading.c
branches/soc-2011-carrot/source/blender/editors/screen/area.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_ops.c
branches/soc-2011-carrot/source/blender/editors/screen/screendump.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/file_draw.c
branches/soc-2011-carrot/source/blender/editors/space_file/file_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/file_panels.c
branches/soc-2011-carrot/source/blender/editors/space_file/filelist.c
branches/soc-2011-carrot/source/blender/editors/space_file/filesel.c
branches/soc-2011-carrot/source/blender/editors/space_file/fsmenu.c
branches/soc-2011-carrot/source/blender/editors/space_file/space_file.c
branches/soc-2011-carrot/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_graph/graph_draw.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
branches/soc-2011-carrot/source/blender/editors/space_info/info_report.c
branches/soc-2011-carrot/source/blender/editors/space_info/space_info.c
branches/soc-2011-carrot/source/blender/editors/space_logic/logic_ops.c
branches/soc-2011-carrot/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_draw.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_header.c
branches/soc-2011-carrot/source/blender/editors/space_node/space_node.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-carrot/source/blender/editors/space_text/space_text.c
branches/soc-2011-carrot/source/blender/editors/space_text/text_ops.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-carrot/source/blender/editors/transform/transform.c
branches/soc-2011-carrot/source/blender/editors/transform/transform.h
branches/soc-2011-carrot/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-carrot/source/blender/editors/util/crazyspace.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-carrot/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2011-carrot/source/blender/imbuf/intern/IMB_indexer.h
branches/soc-2011-carrot/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-carrot/source/blender/imbuf/intern/indexer.c
branches/soc-2011-carrot/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2011-carrot/source/blender/imbuf/intern/readimage.c
branches/soc-2011-carrot/source/blender/imbuf/intern/thumbs.c
branches/soc-2011-carrot/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
branches/soc-2011-carrot/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_boid.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fcurve_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-carrot/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2011-carrot/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/soc-2011-carrot/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-carrot/source/blender/nodes/intern/node_common.c
branches/soc-2011-carrot/source/blender/nodes/intern/node_exec.c
branches/soc-2011-carrot/source/blender/nodes/intern/node_socket.c
branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-carrot/source/blender/python/BPY_extern.h
branches/soc-2011-carrot/source/blender/python/generic/IDProp.c
branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-carrot/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-carrot/source/blender/python/intern/bpy_app.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_library.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_props.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.h
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-carrot/source/blender/render/intern/include/raycounter.h
branches/soc-2011-carrot/source/blender/render/intern/raytrace/bvh.h
branches/soc-2011-carrot/source/blender/render/intern/source/pipeline.c
branches/soc-2011-carrot/source/blender/render/intern/source/renderdatabase.c
branches/soc-2011-carrot/source/blender/windowmanager/WM_api.h
branches/soc-2011-carrot/source/blender/windowmanager/WM_types.h
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-carrot/source/creator/CMakeLists.txt
branches/soc-2011-carrot/source/creator/creator.c
branches/soc-2011-carrot/source/darwin/blender.app/Contents/Info.plist
branches/soc-2011-carrot/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-carrot/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-carrot/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-carrot/source/gameengine/Expressions/ConstExpr.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/soc-2011-carrot/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2011-carrot/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/soc-2011-carrot/source/gameengine/GameLogic/SConscript
branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-carrot/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-carrot/source/gameengine/Ketsji/SConscript
branches/soc-2011-carrot/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-carrot/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2011-carrot/source/gameengine/Rasterizer/RAS_FramingManager.cpp
branches/soc-2011-carrot/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-carrot/source/tests/CMakeLists.txt
branches/soc-2011-carrot/source/tests/rna_info_dump.py
branches/soc-2011-carrot/source/tools/CTS/FBlender.py
branches/soc-2011-carrot/source/tools/compile_scripts.py
Added Paths:
-----------
branches/soc-2011-carrot/doc/python_api/examples/mathutils.Color.py
branches/soc-2011-carrot/release/datafiles/fonts/
branches/soc-2011-carrot/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-carrot/release/datafiles/locale/
branches/soc-2011-carrot/release/datafiles/locale/ar/
branches/soc-2011-carrot/release/datafiles/locale/ar/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/bg/
branches/soc-2011-carrot/release/datafiles/locale/bg/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/bg/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ca/
branches/soc-2011-carrot/release/datafiles/locale/ca/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ca/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/cs/
branches/soc-2011-carrot/release/datafiles/locale/cs/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/cs/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/de/
branches/soc-2011-carrot/release/datafiles/locale/de/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/de/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/el/
branches/soc-2011-carrot/release/datafiles/locale/el/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/el/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/es/
branches/soc-2011-carrot/release/datafiles/locale/es/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/es/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/fa/
branches/soc-2011-carrot/release/datafiles/locale/fa/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/fa/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/fi/
branches/soc-2011-carrot/release/datafiles/locale/fi/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/fi/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/fr/
branches/soc-2011-carrot/release/datafiles/locale/fr/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/hr/
branches/soc-2011-carrot/release/datafiles/locale/hr/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/hr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/hr_HR/
branches/soc-2011-carrot/release/datafiles/locale/hr_HR/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/hr_HR/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/it/
branches/soc-2011-carrot/release/datafiles/locale/it/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/it/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ja/
branches/soc-2011-carrot/release/datafiles/locale/ja/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ja/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ko/
branches/soc-2011-carrot/release/datafiles/locale/ko/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ne/
branches/soc-2011-carrot/release/datafiles/locale/ne/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ne/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/nl/
branches/soc-2011-carrot/release/datafiles/locale/nl/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/nl/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/pl/
branches/soc-2011-carrot/release/datafiles/locale/pl/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/pl/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/pt_BR/
branches/soc-2011-carrot/release/datafiles/locale/pt_BR/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/pt_BR/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ro/
branches/soc-2011-carrot/release/datafiles/locale/ro/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ro/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ru/
branches/soc-2011-carrot/release/datafiles/locale/ru/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ru/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/sr/
branches/soc-2011-carrot/release/datafiles/locale/sr/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/sr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/sr at Latn/
branches/soc-2011-carrot/release/datafiles/locale/sr at Latn/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/sv/
branches/soc-2011-carrot/release/datafiles/locale/sv/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/sv/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/uk/
branches/soc-2011-carrot/release/datafiles/locale/uk/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/uk/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/zh_CN/
branches/soc-2011-carrot/release/datafiles/locale/zh_CN/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/zh_CN/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/zh_TW/
branches/soc-2011-carrot/release/datafiles/locale/zh_TW/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/zh_TW/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/scripts/templates/driver_functions.py
branches/soc-2011-carrot/source/blender/blenlib/BLI_fileops_types.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2011-carrot/source/blender/blenlib/intern/storage.c
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
branches/soc-2011-carrot/source/tools/spell_check_source.py
branches/soc-2011-carrot/source/tools/spell_check_source_config.py
Removed Paths:
-------------
branches/soc-2011-carrot/build_files/scons/config/aix4-config.py
branches/soc-2011-carrot/build_files/scons/config/irix6-config.py
branches/soc-2011-carrot/build_files/scons/config/openbsd3-config.py
branches/soc-2011-carrot/build_files/scons/config/sunos5-config.py
branches/soc-2011-carrot/release/bin/.blender/
branches/soc-2011-carrot/release/datafiles/fonts/droidsans.ttf.gz
branches/soc-2011-carrot/release/datafiles/locale/ar/
branches/soc-2011-carrot/release/datafiles/locale/ar/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ar/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/bg/
branches/soc-2011-carrot/release/datafiles/locale/bg/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/bg/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ca/
branches/soc-2011-carrot/release/datafiles/locale/ca/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ca/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/cs/
branches/soc-2011-carrot/release/datafiles/locale/cs/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/cs/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/de/
branches/soc-2011-carrot/release/datafiles/locale/de/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/de/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/el/
branches/soc-2011-carrot/release/datafiles/locale/el/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/el/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/es/
branches/soc-2011-carrot/release/datafiles/locale/es/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/es/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/fa/
branches/soc-2011-carrot/release/datafiles/locale/fa/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/fa/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/fi/
branches/soc-2011-carrot/release/datafiles/locale/fi/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/fi/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/fr/
branches/soc-2011-carrot/release/datafiles/locale/fr/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/fr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/hr/
branches/soc-2011-carrot/release/datafiles/locale/hr/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/hr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/hr_HR/
branches/soc-2011-carrot/release/datafiles/locale/hr_HR/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/hr_HR/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/it/
branches/soc-2011-carrot/release/datafiles/locale/it/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/it/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ja/
branches/soc-2011-carrot/release/datafiles/locale/ja/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ja/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ko/
branches/soc-2011-carrot/release/datafiles/locale/ko/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ko/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ne/
branches/soc-2011-carrot/release/datafiles/locale/ne/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ne/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/nl/
branches/soc-2011-carrot/release/datafiles/locale/nl/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/nl/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/pl/
branches/soc-2011-carrot/release/datafiles/locale/pl/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/pl/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/pt_BR/
branches/soc-2011-carrot/release/datafiles/locale/pt_BR/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/pt_BR/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ro/
branches/soc-2011-carrot/release/datafiles/locale/ro/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ro/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/ru/
branches/soc-2011-carrot/release/datafiles/locale/ru/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/ru/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/sr/
branches/soc-2011-carrot/release/datafiles/locale/sr/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/sr/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/sr at Latn/
branches/soc-2011-carrot/release/datafiles/locale/sr at Latn/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/sv/
branches/soc-2011-carrot/release/datafiles/locale/sv/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/sv/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/uk/
branches/soc-2011-carrot/release/datafiles/locale/uk/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/uk/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/zh_CN/
branches/soc-2011-carrot/release/datafiles/locale/zh_CN/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/zh_CN/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/release/datafiles/locale/zh_TW/
branches/soc-2011-carrot/release/datafiles/locale/zh_TW/LC_MESSAGES/
branches/soc-2011-carrot/release/datafiles/locale/zh_TW/LC_MESSAGES/blender.mo
branches/soc-2011-carrot/source/blender/blenlib/BLI_storage.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_storage_types.h
branches/soc-2011-carrot/source/blender/blenlib/intern/storage.c
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Info.plist
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/MacOS/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/MacOS/applet
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/PkgInfo
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/
branches/soc-2011-carrot/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
branches/soc-2011-carrot/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-40991
+ /trunk/blender:36828-41197
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-10-22 16:24:28 UTC (rev 41199)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-10-22 16:43:23 UTC (rev 41200)
@@ -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
@@ -774,7 +778,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")
@@ -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/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile 2011-10-22 16:24:28 UTC (rev 41199)
+++ branches/soc-2011-carrot/GNUmakefile 2011-10-22 16:43:23 UTC (rev 41200)
@@ -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 ""
# -----------------------------------------------------------------------------
@@ -167,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
@@ -231,11 +238,18 @@
# 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: '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 -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/soc-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct 2011-10-22 16:24:28 UTC (rev 41199)
+++ branches/soc-2011-carrot/SConstruct 2011-10-22 16:43:23 UTC (rev 41200)
@@ -30,7 +30,6 @@
# Then read all SConscripts and build
#
# TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
-# TODO: cleanup CCFLAGS / CPPFLAGS use, often both are set when we only need one.
import platform as pltfrm
@@ -210,7 +209,7 @@
if sys.platform=='win32':
if bitness==64:
- env.Append(CFLAGS=['-DWIN64']) # -DWIN32 needed too, as it's used all over to target Windows generally
+ env.Append(CPPFLAGS=['-DWIN64']) # -DWIN32 needed too, as it's used all over to target Windows generally
if not env['BF_FANCY']:
B.bc.disable()
@@ -283,22 +282,17 @@
if env['WITH_BF_OPENMP'] == 1:
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
env['CCFLAGS'].append('/openmp')
- env['CPPFLAGS'].append('/openmp')
else:
if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
- env['CPPFLAGS'].append('-openmp')
else:
env.Append(CCFLAGS=['-fopenmp'])
- env.Append(CPPFLAGS=['-fopenmp'])
if env['WITH_GHOST_COCOA'] == True:
- env.Append(CFLAGS=['-DGHOST_COCOA'])
- env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
if env['USE_QTKIT'] == True:
- env.Append(CFLAGS=['-DUSE_QTKIT'])
env.Append(CPPFLAGS=['-DUSE_QTKIT'])
#check for additional debug libnames
@@ -330,20 +324,15 @@
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
- env['CCFLAGS'].append('-DDISABLE_ELBEEM')
if btools.ENDIAN == "big":
env['CPPFLAGS'].append('-D__BIG_ENDIAN__')
- env['CCFLAGS'].append('-D__BIG_ENDIAN__')
else:
env['CPPFLAGS'].append('-D__LITTLE_ENDIAN__')
- env['CCFLAGS'].append('-D__LITTLE_ENDIAN__')
-
# TODO, make optional
env['CPPFLAGS'].append('-DWITH_AUDASPACE')
-env['CCFLAGS'].append('-DWITH_AUDASPACE')
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
B.root_build_dir = env['BF_BUILDDIR']
@@ -505,65 +494,63 @@
scriptinstall = []
if env['OURPLATFORM']!='darwin':
- for dp, dn, df in os.walk('release/bin/.blender'):
- dp = os.path.normpath(dp)
+ dotblenderinstall = []
+ for targetdir,srcfile in zip(dottargetlist, dotblendlist):
+ td, tf = os.path.split(targetdir)
+ dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+ for targetdir,srcfile in zip(datafilestargetlist, datafileslist):
+ td, tf = os.path.split(targetdir)
+ dotblenderinstall.append(env.Install(dir=td, source=srcfile))
+
+ if env['WITH_BF_PYTHON']:
+ #-- local/VERSION/scripts
+ scriptpaths=['release/scripts']
+ for scriptpath in scriptpaths:
+ for dp, dn, df in os.walk(scriptpath):
+ if '.svn' in dn:
+ dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
+ if '__pycache__' in dn: # py3.2 cache dir
+ dn.remove('__pycache__')
- if '.svn' in dn:
- dn.remove('.svn')
- if '_svn' in dn:
- dn.remove('_svn')
-
- for f in df:
- # This files aren't used anymore
- if f in (".bfont.ttf", ):
- continue
+ dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+ dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
- if not env['WITH_BF_INTERNATIONAL']:
- if 'locale' in dp:
- continue
- if not env['WITH_BF_FREETYPE']:
- if f.endswith('.ttf'):
- continue
-
- if 'locale' in dp or 'fonts' in dp:
- datafileslist.append(os.path.join(dp,f))
- dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[3:])) # skip bin
- datafilestargetlist.append(dir + os.sep + f)
+ source=[os.path.join(dp, f) for f in df if not f.endswith(".pyc")]
+ # To ensure empty dirs are created too
+ if len(source)==0:
+ env.Execute(Mkdir(dir))
+ scriptinstall.append(env.Install(dir=dir,source=source))
+
+ if env['WITH_BF_INTERNATIONAL']:
+ internationalpaths=['release' + os.sep + 'datafiles']
+
+ def check_path(path, member):
+ return (member in path.split(os.sep))
+
+ for intpath in internationalpaths:
+ for dp, dn, df in os.walk(intpath):
+ if '.svn' in dn:
+ dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
+ # we only care about release/datafiles/fonts, release/datafiles/locales
+ if check_path(dp, "fonts") or check_path(dp, "locale"):
+ pass
else:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list