[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50258] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 50257.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Wed Aug 29 02:53:33 CEST 2012


Revision: 50258
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50258
Author:   kjym3
Date:     2012-08-29 00:53:29 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 50257.

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50257

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/info_gotcha.rst
    branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/soc-2008-mxcurioni/intern/cycles/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/release/scripts/modules/addon_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/blend_render_info.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/anim_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_xml.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/console.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_mask_common.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/templates/addon_add_object.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_mesh_add.py
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_font.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mask.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mball.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_packedFile.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask_rasterize.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/world.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rect.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_vfontdata.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_250.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/versioning_legacy.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_error.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h
    branches/soc-2008-mxcurioni/source/blender/compositor/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Converter.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_SocketReader.h
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_RotateNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TimeNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TransformNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCurveOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CurveBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CurveBaseOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_InpaintOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_VectorCurveOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_clip.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/io/io_collada.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/mask/mask_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_dopesheet_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_relationships.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/SConscript
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_moviecache.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/bmp.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/SConscript
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imbuf_cocoa.m
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/SConscript
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vfont_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
    branches/soc-2008-mxcurioni/source/blender/nodes/SConscript
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_boxmask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_common.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_inpaint.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keying.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lensdist.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rgb.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_trackpos.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_value.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_ops.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/rayobject.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_playanim.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/BoolValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBuff.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBuff.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mask_evaluate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqmodifier.c
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DespeckleNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DespeckleNode.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DespeckleOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DespeckleOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_view.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_despeckle.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceMatteOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DistanceMatteOperation.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-49986
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47664,47667-50257

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-08-28 13:43:20 UTC (rev 50257)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-08-29 00:53:29 UTC (rev 50258)
@@ -132,6 +132,7 @@
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
+option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON)
 
 # GHOST Windowing Library Options
 option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
@@ -1042,6 +1043,8 @@
 			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
 			
 			add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
+			#Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes
+			set(WITH_OPENMP OFF)
 		endif()
 
 		add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -1796,6 +1799,7 @@
 	info_cfg_option(WITH_GAMEENGINE)
 	info_cfg_option(WITH_PLAYER)
 	info_cfg_option(WITH_BULLET)
+	info_cfg_option(WITH_IK_SOLVER)
 	info_cfg_option(WITH_IK_ITASC)
 	info_cfg_option(WITH_OPENCOLLADA)
 	info_cfg_option(WITH_FFTW3)

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py	2012-08-28 13:43:20 UTC (rev 50257)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py	2012-08-29 00:53:29 UTC (rev 50258)
@@ -170,7 +170,7 @@
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
 
 #May produce errors with unsupported MinGW-w64 builds
-WITH_BF_OPENMP = True
+WITH_BF_OPENMP = False
 
 ##
 CC = 'gcc'

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-08-28 13:43:20 UTC (rev 50257)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-08-29 00:53:29 UTC (rev 50258)
@@ -845,6 +845,8 @@
         print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
         lenv = self.Clone()
         lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS'])
+        if lenv['OURPLATFORM'] in ('win32-mingw', 'win64-mingw', 'linuxcross', 'cygwin', 'linux'):
+            lenv.Replace(LINK = '$CXX')
         if lenv['OURPLATFORM'] in ('win32-vc', 'cygwin', 'win64-vc'):
             if lenv['BF_DEBUG']:
                 lenv.Prepend(LINKFLAGS = ['/DEBUG','/PDB:'+progname+'.pdb','/NODEFAULTLIB:libcmt'])

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2012-08-28 13:43:20 UTC (rev 50257)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2012-08-29 00:53:29 UTC (rev 50258)
@@ -108,7 +108,7 @@
             'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC',
             'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB',
             'WITH_BF_FRAMESERVER',
-            'WITH_BF_COMPOSITOR',
+            'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY',
             'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH',
             'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH',
             'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH',
@@ -583,7 +583,8 @@
         ('BF_BOOST_LIBPATH', 'Boost library path', ''),
         ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
 
-        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True))
+        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)),
+        (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', True))
     ) # end of opts.AddOptions()
 
     return localopts

Modified: branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst	2012-08-28 13:43:20 UTC (rev 50257)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/info_best_practice.rst	2012-08-29 00:53:29 UTC (rev 50258)
@@ -75,7 +75,7 @@
 
 * layout.row()
 
-  Use row(), when you want more than 1 propertey in one line. 
+  Use row(), when you want more than 1 property in one line. 
   
   .. code-block:: python
 	 
@@ -145,7 +145,7 @@
 
 Modifying Lists
 ^^^^^^^^^^^^^^^
-In python we can add and remove from a list, This is slower when the list length is modified, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.
+In python we can add and remove from a list, this is slower when the list length is modified, especially at the start of the list, since all the data after the index of modification needs to be moved up or down 1 place.
 
 The most simple way to add onto the end of the list is to use ``my_list.append(list_item)`` or ``my_list.extend(some_list)`` and the fastest way to remove an item is ``my_list.pop()`` or ``del my_list[-1]``.
 
@@ -154,13 +154,13 @@
 Sometimes its faster (but more memory hungry) to just rebuild the list.
 
 
-Say you want to remove all triangle faces in a list.
+Say you want to remove all triangular faces in a list.
 
 Rather than...
 
 .. code-block:: python
 
-   faces = mesh.faces[:]  # make a list copy of the meshes faces
+   faces = mesh.tessfaces[:]  # make a list copy of the meshes faces
    f_idx = len(faces)     # Loop backwards
    while f_idx:           # while the value is not 0
        f_idx -= 1
@@ -173,13 +173,13 @@
 
 .. code-block:: python
 
-   faces = [f for f in mesh.faces if len(f.vertices) != 3]
+   faces = [f for f in mesh.tessfaces if len(f.vertices) != 3]
 
 
 Adding List Items
 ^^^^^^^^^^^^^^^^^
 
-If you have a list that you want to add onto another list, rather then...
+If you have a list that you want to add onto another list, rather than...
 
 .. code-block:: python
 
@@ -205,6 +205,14 @@
        reverse_list.insert(0, list_item)
 
 
+Python provides more convenient ways to reverse a list using the slice method, but you may want to time this before relying on it too much:
+
+
+.. code-block:: python
+
+  some_reversed_list = some_list[::-1]
+
+
 Removing List Items
 ^^^^^^^^^^^^^^^^^^^
 
@@ -224,7 +232,7 @@
            my_list.pop(list_index)
 
 
-This example shows a fast way of removing items, for use in cases were where you can alter the list order without breaking the scripts functionality. This works by swapping 2 list items, so the item you remove is always last.
+This example shows a fast way of removing items, for use in cases where you can alter the list order without breaking the scripts functionality. This works by swapping 2 list items, so the item you remove is always last.
 
 .. code-block:: python
 
@@ -243,9 +251,9 @@
 Avoid Copying Lists
 ^^^^^^^^^^^^^^^^^^^
 
-When passing a list/dictionary to a function, it is faster to have the function modify the list rather then returning a new list so python doesn't have to duplicate the list in memory.
+When passing a list/dictionary to a function, it is faster to have the function modify the list rather than returning a new list so python doesn't have to duplicate the list in memory.
 
-Functions that modify a list in-place are more efficient then functions that create new lists.
+Functions that modify a list in-place are more efficient than functions that create new lists.
 
 
 This is generally slower so only use for functions when it makes sense not to modify the list in place.
@@ -273,22 +281,22 @@
 This really applies to any area of your code that involves a lot of string joining.
 
 
-Pythons string addition, *don't use if you can help it, especially when writing data in a loop.*
+Python’s string addition, *don't use if you can help it, especially when writing data in a loop.*
 
 >>> file.write(str1 + " " + str2 + " " + str3 + "\n")
 
 
-String formatting. Use this when you're writing string data from floats and int's
+String formatting. Use this when you're writing string data from floats and ints
 
 >>> file.write("%s %s %s\n" % (str1, str2, str3))
 
 
-Pythons string joining function. To join a list of strings
+Python’s string joining function. To join a list of strings
 
 >>> file.write(" ".join([str1, str2, str3, "\n"]))
 
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list