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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun May 27 00:22:46 CEST 2012


Revision: 47058
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47058
Author:   kjym3
Date:     2012-05-26 22:22:45 +0000 (Sat, 26 May 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 47056.

Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-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/examples/bpy.types.Mesh.py
    branches/soc-2008-mxcurioni/doc/python_api/rst/bge.render.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/include__bmesh.rst
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_object.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_object.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_shader.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2008-mxcurioni/intern/cycles/render/graph.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
    branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/object.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_hash.h
    branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_IEvent.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_IEventConsumer.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystemPaths.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ITimerTask.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Path-api.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Rect.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Buttons.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Buttons.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_CallbackEventConsumer.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerNULL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DropTargetWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Event.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventButton.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventCursor.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventKey.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventManager.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventNDOF.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventPrinter.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventString.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventTrackpad.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventWheel.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystem.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ModifierKeys.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ModifierKeys.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Rect.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemNULL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPaths.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemSDL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TaskbarWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TimerManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TimerManager.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TimerTask.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowNULL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowSDL.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_C-Test.c
    branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/Basic.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/ScrollBar.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/Util.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/WindowData.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mmap_win.c
    branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/soc-2008-mxcurioni/release/datafiles/blender_icons.png
    branches/soc-2008-mxcurioni/release/plugins/sequence/blur.c
    branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-hsv.c
    branches/soc-2008-mxcurioni/release/plugins/sequence/dnr.c
    branches/soc-2008-mxcurioni/release/plugins/sequence/scatter.c
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/anim.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_animviz.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avirgb.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.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/intern/CCGSubSurf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.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/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.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/deform.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.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/image_gen.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.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/mesh_validate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.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/ocean.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.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/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_color.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fnmatch.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/uvproject.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.h
    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/blenpluginapi/iff.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
    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_operators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_slide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ExportSettings.h
    branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_InputSocket.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_InputSocket.h
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_Node.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/intern/COM_compositor.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_AlphaOverNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BilateralBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BoxMaskNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_BrightnessNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ChromaMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorCorrectionNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorCurveNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorRampNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorSpillNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ColorToBWNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_CombineRGBANode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ConvertAlphaNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_CropNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DefocusNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DifferenceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DirectionalBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DisplaceNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_EllipseMaskNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_FilterNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_FlipNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GammaNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GlareNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_GroupNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_HueSaturationValueNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_IDMaskNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_InvertNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_LensDistortionNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MapUVNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MapValueNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MixNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MovieClipNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_MovieDistortionNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_NormalNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_NormalizeNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_RotateNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ScaleNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SeparateRGBANode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_Stabilize2dNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_SwitchNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TextureNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TonemapNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TransformNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_TranslateNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_VectorBlurNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_VectorCurveNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ViewerNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/nodes/COM_ZCombineNode.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_BokehImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ColorCorrectionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_CompositorOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_DilateErodeOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_GlareBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_ImageOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_LensGhostOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MapUVOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MathBaseOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieClipOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_MovieDistortionOperation.h
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_OpenCLKernels.cl.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_PreviewOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TextureOperation.cpp
    branches/soc-2008-mxcurioni/source/blender/compositor/operations/COM_TextureOperation.h
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blender_icons.png.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_node.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_particle.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.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_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_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/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.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/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.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_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_mask.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.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_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.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/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    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_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.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/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.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.h
    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_input.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.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/util/editmode_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.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/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2008-mxcurioni/source/blender/gpu/shaders/gpu_shader_material.glsl.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logImageLib.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filetype.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c
    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_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_smoke_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.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_api.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_rna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.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_userdef.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.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_shader.h
    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/nodes/node_composite_blur.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_colorcorrection.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_ellipsemask.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.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/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.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_Quaternion.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_import.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/pixelblending.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/shading.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/sss.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/texture.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.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/pixelblending.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelshading.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.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/renderdatabase.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sss.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
    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_jobs.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.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/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/release/scripts/presets/operator/
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_object_info.c
    branches/soc-2008-mxcurioni/source/tools/codereview_upload.py

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-46787
   + /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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-47056

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-05-26 22:21:56 UTC (rev 47057)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-05-26 22:22:45 UTC (rev 47058)
@@ -103,8 +103,8 @@
 #-----------------------------------------------------------------------------
 # Redirect output files
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE )
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
 
 #-----------------------------------------------------------------------------
 # Set default config options
@@ -161,8 +161,6 @@
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	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)
 
 	# freebsd doesn't seems to support XDND
 	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -238,8 +236,14 @@
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
 option(WITH_CYCLES_TEST				"Build cycles test application" OFF)
 option(WITH_CYCLES_CUDA_BINARIES	"Build cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH		sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for")
+if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64)
+	set(PLATFORM_DEFAULT sm_20 sm_21)
+else()
+	set(PLATFORM_DEFAULT sm_13 sm_20 sm_21)
+endif()
+set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
+unset(PLATFORM_DEFAULT)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -1187,13 +1191,13 @@
 	endif()
 
 	if(${XCODE_VERSION} VERSION_LESS 4.3)
-		SET(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE ) # use guaranteed existing sdk
+		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
 	else()
 		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
 		# absolute pathes are more foolproof here !
-		SET(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
-		SET(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
-		SET(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+		set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
 	endif()	
 	
 	if(WITH_LIBS10.5)
@@ -1365,7 +1369,7 @@
 		)
 
 		set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-		set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
+		set(OPENCOLLADA_LIBRARIES "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa")
 		#pcre is bundled with openCollada
 		#set(PCRE ${LIBDIR}/pcre)
 		#set(PCRE_LIBPATH ${PCRE}/lib)

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2012-05-26 22:21:56 UTC (rev 47057)
+++ branches/soc-2008-mxcurioni/SConstruct	2012-05-26 22:22:45 UTC (rev 47058)
@@ -553,7 +553,7 @@
 
                 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:
+                if len(source)==0 and not os.path.exists(dir):
                     env.Execute(Mkdir(dir))
                 scriptinstall.append(env.Install(dir=dir,source=source))
         if env['WITH_BF_CYCLES']:

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-05-26 22:21:56 UTC (rev 47057)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-05-26 22:22:45 UTC (rev 47058)
@@ -169,6 +169,11 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
+#CUDA
+WITH_BF_CYCLES_CUDA_BINARIES = False
+#BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-05-26 22:21:56 UTC (rev 47057)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-05-26 22:22:45 UTC (rev 47058)
@@ -869,12 +869,17 @@
             lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
         elif os.sep == '/' and lenv['OURPLATFORM'] != 'linuxcross': # any unix (except cross-compilation)
             if lenv['WITH_BF_PYTHON']:
-                if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+                if (not lenv['WITHOUT_BF_INSTALL'] and 
+                    not lenv['WITHOUT_BF_PYTHON_INSTALL'] and 
+                    not lenv['WITHOUT_BF_PYTHON_UNPACK'] and 
+                    not BlenderEnvironment.PyBundleActionAdded):
                     lenv.AddPostAction(prog,Action(UnixPyBundle,strfunction=my_unixpybundle_print))
                     BlenderEnvironment.PyBundleActionAdded = True
         elif lenv['OURPLATFORM'].startswith('win') or lenv['OURPLATFORM'] == 'linuxcross': # windows or cross-compilation
             if lenv['WITH_BF_PYTHON']:
-                if not lenv['WITHOUT_BF_PYTHON_INSTALL'] and not BlenderEnvironment.PyBundleActionAdded:
+                if (not lenv['WITHOUT_BF_PYTHON_INSTALL'] and 
+                    not lenv['WITHOUT_BF_PYTHON_UNPACK'] and 
+                    not BlenderEnvironment.PyBundleActionAdded):
                     lenv.AddPostAction(prog,Action(WinPyBundle,strfunction=my_winpybundle_print))
                     BlenderEnvironment.PyBundleActionAdded = True
         return prog

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2012-05-26 22:21:56 UTC (rev 47057)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py	2012-05-26 22:22:45 UTC (rev 47058)
@@ -134,7 +134,7 @@
             'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
             'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
             'WITHOUT_BF_INSTALL',
-            'WITHOUT_BF_PYTHON_INSTALL',
+            'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
             'WITHOUT_BF_OVERWRITE_INSTALL',
             'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
             'WITH_GHOST_COCOA',
@@ -519,6 +519,7 @@
         (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
         (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
         (BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
+        (BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack Python modules everytime if true', False)),
         (BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing files before breating the new install directory (set to False when making packages for others)', False)),
         (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
         (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),

Modified: branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Mesh.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Mesh.py	2012-05-26 22:21:56 UTC (rev 47057)
+++ branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Mesh.py	2012-05-26 22:22:45 UTC (rev 47058)
@@ -28,7 +28,7 @@
 import bpy
 
 me = bpy.context.object.data

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list