[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43361] branches/soc-2011-onion-uv-tools: Merge with trunk 43360

Antony Riakiotakis kalast at gmail.com
Fri Jan 13 19:27:39 CET 2012


Revision: 43361
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43361
Author:   psy-fi
Date:     2012-01-13 18:27:33 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Merge with trunk 43360

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/build_files/cmake/RpmBuild.cmake
    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/tools/btools.py
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.texture.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.types.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_overview.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_quickstart.rst
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-onion-uv-tools/extern/libmv/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/extern/libmv/SConscript
    branches/soc-2011-onion-uv-tools/extern/libmv/bundle.sh
    branches/soc-2011-onion-uv-tools/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
    branches/soc-2011-onion-uv-tools/extern/libmv/third_party/glog/src/utilities.cc
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy/utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/rna_xml.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/h264.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/theora.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/xvid.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/wm.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.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_info.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/BLF_api.h
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_armature.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_brush.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeavi.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeframeserver.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/boids.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/library.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/material.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/node.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.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/pointcache.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/property.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_editVert.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_fnmatch.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/storage.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/poseSlide.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/armature/reeb.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editfont.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/datafiles/Bfont.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_armature.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_image.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.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_layout.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_style.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_widgets.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/view2d.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.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_group.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_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_modifier.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_ops.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_select.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_opengl.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_edit.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/paint_stroke.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_action/action_draw.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_clip/clip_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_console/console_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/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_graph/graph_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_edit.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_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_info/info_ops.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_logic/logic_window.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/drawnode.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_outliner/outliner_draw.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_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_draw.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/drawanimviz.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/drawobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_buttons.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_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.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_constraints.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/util/ed_util.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/util/numinput.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/util/undo.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/divers.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/indexer.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/tiff.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_controller_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_defs.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_effect_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_key_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_force.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_property_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.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_brush.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_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_nodetree_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_object.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_tracking.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/modifiers/intern/MOD_armature.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/soc-2011-onion-uv-tools/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/nodes/NOD_composite.h
    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/node_composite_util.h
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/idprop_py_api.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_props.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/include/render_types.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/WM_api.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_init_exit.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_jobs.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/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PythonInit.cpp

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c

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
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39665-43247
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39665-43359

Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt	2012-01-13 18:27:33 UTC (rev 43361)
@@ -156,7 +156,7 @@
 
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
-	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	OFF)
+	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
 	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
 	mark_as_advanced(WITH_XDG_USER_DIRS)
@@ -461,7 +461,8 @@
 		# use lib dir if available and nothing else specified
 		if(LIBDIR AND NOT FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
-			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+			# XXX, some distros might need 'theoraenc theoradec' too
+			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
 		else()
 			set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
 			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
@@ -619,6 +620,10 @@
 	# CLang is the same as GCC for now.
 	elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	# Solaris CC
+	elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") 
+		set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__")
+		
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken

Modified: branches/soc-2011-onion-uv-tools/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/RpmBuild.cmake	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/RpmBuild.cmake	2012-01-13 18:27:33 UTC (rev 43361)
@@ -13,7 +13,7 @@
 
 	if(RPMBUILD)
 		message(STATUS "RPM Build Found: ${RPMBUILD}")
-	else(RPMBUILD) 
+	else() 
 		message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
 	endif()
 
@@ -21,6 +21,6 @@
 
 if(RPMBUILD)
 	set(RPMBUILD_FOUND TRUE)
-else(RPMBUILD) 
+else() 
 	set(RPMBUILD_FOUND FALSE)
 endif()
\ No newline at end of file

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd7-config.py	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd7-config.py	2012-01-13 18:27:33 UTC (rev 43361)
@@ -117,7 +117,7 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True  # -DWITH_OGG 
+WITH_BF_OGG = True
 BF_OGG = '/usr/local'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd8-config.py	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd8-config.py	2012-01-13 18:27:33 UTC (rev 43361)
@@ -117,7 +117,7 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True  # -DWITH_OGG 
+WITH_BF_OGG = True
 BF_OGG = '/usr/local'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd9-config.py	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/freebsd9-config.py	2012-01-13 18:27:33 UTC (rev 43361)
@@ -117,7 +117,7 @@
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = True  # -DWITH_OGG 
+WITH_BF_OGG = True
 BF_OGG = '/usr/local'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/linux-config.py	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/linux-config.py	2012-01-13 18:27:33 UTC (rev 43361)
@@ -140,7 +140,7 @@
 #BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a'
 
 # enable ogg, vorbis and theora in ffmpeg
-WITH_BF_OGG = False  # -DWITH_OGG 
+WITH_BF_OGG = False
 BF_OGG = '/usr'
 BF_OGG_INC = '${BF_OGG}/include'
 BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec'

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py	2012-01-13 18:27:33 UTC (rev 43361)
@@ -323,7 +323,7 @@
         (BoolVariable('WITH_BF_STATICFFMPEG', 'Use static FFMPEG if true', False)),
         ('BF_FFMPEG_LIB_STATIC', 'Static FFMPEG libraries', ''),
         
-        (BoolVariable('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true',
+        (BoolVariable('WITH_BF_OGG', 'Link OGG, THEORA, VORBIS with FFMPEG if true',
                     False)),
         ('BF_OGG', 'OGG base path', ''),
         ('BF_OGG_LIB', 'OGG library', ''),

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.texture.rst
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.texture.rst	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.texture.rst	2012-01-13 18:27:33 UTC (rev 43361)
@@ -516,7 +516,7 @@
       line by line starting from the bottom of the image. The pixel size and format is determined by the mode
       parameter.
 
-.. function materialID(object,name)
+.. function:: materialID(object,name)
 
    Returns a numeric value that can be used in :class:`Texture` to create a dynamic texture.
 
@@ -538,7 +538,7 @@
    :type name: string
    :rtype: integer
 
-.. function setLogFile(filename)
+.. function:: setLogFile(filename)
 
    Sets the name of a text file in which runtime error messages will be written, in addition to the printing
    of the messages on the Python console. Only the runtime errors specific to the VideoTexture module

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.types.rst	2012-01-13 17:25:24 UTC (rev 43360)
+++ branches/soc-2011-onion-uv-tools/doc/python_api/rst/bge.types.rst	2012-01-13 18:27:33 UTC (rev 43361)
@@ -1765,33 +1765,29 @@
       #. Polygon shape (triangle/quad)
       #. Game Object
 
-   #. Verticies will be split by face if necessary.  Verticies can only be shared between faces if:
+   #. Vertices will be split by face if necessary.  Vertices can only be shared between faces if:
 
       #. They are at the same position
       #. UV coordinates are the same
       #. Their normals are the same (both polygons are "Set Smooth")
-      #. They are the same colour, for example: a cube has 24 verticies: 6 faces with 4 verticies per face.
+      #. They are the same colour, for example: a cube has 24 vertices: 6 faces with 4 vertices per face.
 
    The correct method of iterating over every :class:`KX_VertexProxy` in a game object
    
    .. code-block:: python
 
-      import GameLogic
+      from bge import logic
 
-      co = GameLogic.getCurrentController()
-      obj = co.owner
+      cont = logic.getCurrentController()
+      object = cont.owner
 
-      m_i = 0
-      mesh = obj.getMesh(m_i) # There can be more than one mesh...
-      while mesh != None:
-         for mat in range(mesh.getNumMaterials()):
+      for mesh in object.meshes:
+         for material in mesh.materials:
             for v_index in range(mesh.getVertexArrayLength(mat)):
                vertex = mesh.getVertex(mat, v_index)
                # Do something with vertex here...
                # ... eg: colour the vertex red.
                vertex.colour = [1.0, 0.0, 0.0, 1.0]
-         m_i += 1
-         mesh = obj.getMesh(m_i)
 
    .. attribute:: materials
 
@@ -2401,136 +2397,54 @@
 
       Some of the methods/variables are CObjects.  If you mix these up, you will crash blender.
 
-   This example requires `PyOpenGL <http://pyopengl.sourceforge.net>`_ and `GLEWPy <http://glewpy.sourceforge.net>`_
-
    .. code-block:: python
 
-      import GameLogic
-      import OpenGL

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list