[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41252] branches/soc-2011-onion-uv-tools: merge trunk up to dreaded commit no 41227

Antony Riakiotakis kalast at gmail.com
Mon Oct 24 17:41:59 CEST 2011


Revision: 41252
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41252
Author:   psy-fi
Date:     2011-10-24 15:41:58 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
merge trunk up to dreaded commit no 41227

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/GNUmakefile
    branches/soc-2011-onion-uv-tools/SConstruct
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-i686.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-player-x86_64.py
    branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-x86_64.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/darwin-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd7-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd8-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd9-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/linux-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/Blender.py
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
    branches/soc-2011-onion-uv-tools/doc/blender_file_format/BlendFileDnaExporter_25.py
    branches/soc-2011-onion-uv-tools/doc/blender_file_format/README
    branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.py
    branches/soc-2011-onion-uv-tools/doc/python_api/sphinx_doc_gen.sh
    branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/soc-2011-onion-uv-tools/intern/ffmpeg/ffmpeg_compat.h
    branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_Types.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_EventKey.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2011-onion-uv-tools/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2011-onion-uv-tools/intern/memutil/MEM_SmartPtr.h
    branches/soc-2011-onion-uv-tools/intern/tools/dump_rna2xml.py
    branches/soc-2011-onion-uv-tools/po/README.txt
    branches/soc-2011-onion-uv-tools/po/update_mo.py
    branches/soc-2011-onion-uv-tools/release/datafiles/splash.png
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_types.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/console_python.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/interaction/blender.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/object.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_scene.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-onion-uv-tools/release/scripts/templates/driver_functions.py
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_font.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_util.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_bvhutils.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_font.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_eulers.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/BME_structure.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cloth.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/font.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/key.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/property.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/smoke.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_blenlib.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_fileops.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_ghash.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_mempool.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_path_util.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_scanfill.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_string.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/PIL_time.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/bpath.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/winstuff.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/BLO_readfile.h
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/BLO_runtime.h
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/runtime.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-onion-uv-tools/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/ImageExporter.cpp
    branches/soc-2011-onion-uv-tools/source/blender/collada/collada.cpp
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyingsets.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseUtils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poselib.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editfont.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/datafiles/splash.png.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_gpencil.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_keyframing.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/UI_interface.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_anim.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/resources.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_constraint.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_hook.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_relations.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_preview.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_shading.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/area.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screendump.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/buttons_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/file_panels.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filelist.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/filesel.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/fsmenu.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/space_file.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/info_report.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/space_info.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_header.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/space_node.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/space_text.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/IMB_anim.h
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/readimage.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/thumbs.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_armature_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fcurve_api.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/rna_cleanup/rna_update.sh
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_common.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_socket.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2011-onion-uv-tools/source/blender/python/BPY_extern.h
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/IDProp.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/py_capi_utils.h
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/render/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/render/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/renderpipeline.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_api.h
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_types.h
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2011-onion-uv-tools/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/creator/creator.c
    branches/soc-2011-onion-uv-tools/source/darwin/blender.app/Contents/Info.plist
    branches/soc-2011-onion-uv-tools/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SConscript
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/SConscript
    branches/soc-2011-onion-uv-tools/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2011-onion-uv-tools/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/soc-2011-onion-uv-tools/source/tests/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/tests/rna_info_dump.py
    branches/soc-2011-onion-uv-tools/source/tools/CTS/FBlender.py
    branches/soc-2011-onion-uv-tools/source/tools/compile_scripts.py
    branches/soc-2011-onion-uv-tools/source/tools/spell_check_source_config.py

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/release/datafiles/fonts/
    branches/soc-2011-onion-uv-tools/release/datafiles/locale/
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_fileops_types.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_string_utf8.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/storage.c
    branches/soc-2011-onion-uv-tools/source/blender/render/extern/include/RE_engine.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-onion-uv-tools/source/darwin/set_simulation_threads.app/

Removed Paths:
-------------
    branches/soc-2011-onion-uv-tools/build_files/scons/config/aix4-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/irix6-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/openbsd3-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/sunos5-config.py
    branches/soc-2011-onion-uv-tools/release/bin/.blender/
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_storage.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_storage_types.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/storage.c
    branches/soc-2011-onion-uv-tools/source/darwin/set_simulation_threads.app/
    branches/soc-2011-onion-uv-tools/source/darwin/set_simulation_threads_applescript.scpt

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39665-41109
   + /trunk/blender:39665-41109,41115-41225

Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt	2011-10-24 15:29:51 UTC (rev 41251)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt	2011-10-24 15:41:58 UTC (rev 41252)
@@ -213,6 +213,7 @@
 option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
+
 if(APPLE)
 	if(NOT CMAKE_OSX_ARCHITECTURES)
 		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING

Modified: branches/soc-2011-onion-uv-tools/GNUmakefile
===================================================================
--- branches/soc-2011-onion-uv-tools/GNUmakefile	2011-10-24 15:29:51 UTC (rev 41251)
+++ branches/soc-2011-onion-uv-tools/GNUmakefile	2011-10-24 15:41:58 UTC (rev 41252)
@@ -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/soc-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct	2011-10-24 15:29:51 UTC (rev 41251)
+++ branches/soc-2011-onion-uv-tools/SConstruct	2011-10-24 15:41:58 UTC (rev 41252)
@@ -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:
-                    dotblendlist.append(os.path.join(dp, f))
-                    dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['config'] + dp.split(os.sep)[3:]))    # skip bin
-                    dottargetlist.append(dir + os.sep + f)
-                    
-        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__')
+                    continue
+                
+                dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
+                dir += os.sep + os.path.basename(intpath) + dp[len(intpath):]
 
-                    dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
-                    dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
+                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))
 
-                    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))
-
 #-- icons
 if env['OURPLATFORM']=='linux':
     iconlist = []

Modified: branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py	2011-10-24 15:29:51 UTC (rev 41251)
+++ branches/soc-2011-onion-uv-tools/build_files/buildbot/config/user-config-i686.py	2011-10-24 15:41:58 UTC (rev 41252)
@@ -94,6 +94,7 @@
 
 # Compilation and optimization
 BF_DEBUG = False
-REL_CFLAGS = ['-O2']
-REL_CCFLAGS = ['-O2']

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list