[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43275] branches/soc-2011-cucumber: svn merge ^/trunk/blender -r42742:43270

Dalai Felinto dfelinto at gmail.com
Wed Jan 11 03:13:19 CET 2012


Revision: 43275
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43275
Author:   dfelinto
Date:     2012-01-11 02:13:09 +0000 (Wed, 11 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r42742:43270

conflicted files I had to fix manually:
--------------------------------------
wm.py
properties_particle.py
properties_game.py
rna_scene.c
KX_BlenderInputDevice.h
BL_BlenderDataConversion.cpp
GPG_Application.cpp
BL_Material.cpp
KX_FontObject.cpp

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

Modified Paths:
--------------
    branches/soc-2011-cucumber/CMakeLists.txt
    branches/soc-2011-cucumber/SConstruct
    branches/soc-2011-cucumber/build_files/cmake/macros.cmake
    branches/soc-2011-cucumber/build_files/scons/config/freebsd7-config.py
    branches/soc-2011-cucumber/build_files/scons/config/freebsd8-config.py
    branches/soc-2011-cucumber/build_files/scons/config/freebsd9-config.py
    branches/soc-2011-cucumber/build_files/scons/config/linux-config.py
    branches/soc-2011-cucumber/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-cucumber/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-cucumber/build_files/scons/tools/btools.py
    branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.Operator.4.py
    branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.Operator.5.py
    branches/soc-2011-cucumber/doc/python_api/rst/change_log.rst
    branches/soc-2011-cucumber/doc/python_api/rst/info_best_practice.rst
    branches/soc-2011-cucumber/doc/python_api/rst/info_quickstart.rst
    branches/soc-2011-cucumber/doc/python_api/rst/info_tips_and_tricks.rst
    branches/soc-2011-cucumber/extern/CMakeLists.txt
    branches/soc-2011-cucumber/intern/CMakeLists.txt
    branches/soc-2011-cucumber/intern/SConscript
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soc-2011-cucumber/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
    branches/soc-2011-cucumber/intern/cycles/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/app/cycles_server.cpp
    branches/soc-2011-cucumber/intern/cycles/app/cycles_test.cpp
    branches/soc-2011-cucumber/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/blender/addon/engine.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/enums.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/properties.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/ui.py
    branches/soc-2011-cucumber/intern/cycles/blender/blender_camera.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_python.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_session.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_session.h
    branches/soc-2011-cucumber/intern/cycles/blender/blender_shader.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_sync.h
    branches/soc-2011-cucumber/intern/cycles/device/device.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device.h
    branches/soc-2011-cucumber/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_intern.h
    branches/soc-2011-cucumber/intern/cycles/device/device_memory.h
    branches/soc-2011-cucumber/intern/cycles/device/device_multi.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_network.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel.cl
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel.cu
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_camera.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_displace.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_film.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_optimized.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_random.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-cucumber/intern/cycles/kernel/osl/nodes/node_hsv.osl
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_hsv.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_normal.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-cucumber/intern/cycles/render/buffers.cpp
    branches/soc-2011-cucumber/intern/cycles/render/buffers.h
    branches/soc-2011-cucumber/intern/cycles/render/camera.cpp
    branches/soc-2011-cucumber/intern/cycles/render/integrator.cpp
    branches/soc-2011-cucumber/intern/cycles/render/integrator.h
    branches/soc-2011-cucumber/intern/cycles/render/mesh_displace.cpp
    branches/soc-2011-cucumber/intern/cycles/render/nodes.cpp
    branches/soc-2011-cucumber/intern/cycles/render/nodes.h
    branches/soc-2011-cucumber/intern/cycles/render/session.cpp
    branches/soc-2011-cucumber/intern/cycles/render/session.h
    branches/soc-2011-cucumber/intern/cycles/render/tile.cpp
    branches/soc-2011-cucumber/intern/cycles/render/tile.h
    branches/soc-2011-cucumber/intern/cycles/util/util_math.h
    branches/soc-2011-cucumber/intern/cycles/util/util_progress.h
    branches/soc-2011-cucumber/intern/ghost/CMakeLists.txt
    branches/soc-2011-cucumber/intern/ghost/GHOST_C-api.h
    branches/soc-2011-cucumber/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-cucumber/intern/ghost/GHOST_IWindow.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Debug.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_DisplayManager.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_EventKey.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_EventNDOF.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_EventTrackpad.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_TimerTask.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_Window.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-cucumber/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2011-cucumber/intern/iksolver/intern/IK_Solver.cpp
    branches/soc-2011-cucumber/intern/mikktspace/mikktspace.c
    branches/soc-2011-cucumber/intern/opennl/intern/opennl.c
    branches/soc-2011-cucumber/intern/opennl/superlu/get_perm_c.c
    branches/soc-2011-cucumber/intern/opennl/superlu/scolumn_bmod.c
    branches/soc-2011-cucumber/intern/opennl/superlu/strsv.c
    branches/soc-2011-cucumber/intern/opennl/superlu/sutil.c
    branches/soc-2011-cucumber/intern/opennl/superlu/util.h
    branches/soc-2011-cucumber/intern/smoke/intern/smoke_API.cpp
    branches/soc-2011-cucumber/intern/tools/dump_rna2xml.py
    branches/soc-2011-cucumber/release/datafiles/blender_icons.png
    branches/soc-2011-cucumber/release/plugins/sequence/color-correction-hsv.c
    branches/soc-2011-cucumber/release/plugins/sequence/color-correction-yuv.c
    branches/soc-2011-cucumber/release/plugins/sequence/dnr.c
    branches/soc-2011-cucumber/release/plugins/sequence/gamma.c
    branches/soc-2011-cucumber/release/scripts/modules/animsys_refactor.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy/utils.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/rna_prop_ui.py
    branches/soc-2011-cucumber/release/scripts/modules/sys_info.py
    branches/soc-2011-cucumber/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2011-cucumber/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2011-cucumber/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2011-cucumber/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/anim.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/object_randomize_transform.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/sequencer.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_logic.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-cucumber/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf.c
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_array_mallocn.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_sound.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2011-cucumber/source/blender/blenkernel/depsgraph_private.h
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/cloth.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/idprop.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/image.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/modifier.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/node.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/object.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_dynstr.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_math_color.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-cucumber/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_dynstr.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/edgehash.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_color.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/storage.c
    branches/soc-2011-cucumber/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2011-cucumber/source/blender/blenloader/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenloader/SConscript
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-cucumber/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_filter.c
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poselib.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poseobject.c
    branches/soc-2011-cucumber/source/blender/editors/curve/curve_intern.h
    branches/soc-2011-cucumber/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-cucumber/source/blender/editors/curve/editfont.c
    branches/soc-2011-cucumber/source/blender/editors/datafiles/Bfont.c
    branches/soc-2011-cucumber/source/blender/editors/datafiles/blender_icons.png.c
    branches/soc-2011-cucumber/source/blender/editors/include/BIF_glutil.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_object.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-cucumber/source/blender/editors/include/UI_icons.h
    branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-cucumber/source/blender/editors/interface/view2d.c
    branches/soc-2011-cucumber/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editface.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_bake.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_constraint.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_group.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_intern.h
    branches/soc-2011-cucumber/source/blender/editors/object/object_modifier.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_ops.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-cucumber/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2011-cucumber/source/blender/editors/physics/particle_object.c
    branches/soc-2011-cucumber/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_internal.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_opengl.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_preview.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_shading.c
    branches/soc-2011-cucumber/source/blender/editors/screen/glutil.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screendump.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-cucumber/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/filesel.c
    branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/space_node.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.h
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-cucumber/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-cucumber/source/blender/imbuf/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-cucumber/source/blender/imbuf/IMB_imbuf_types.h
    branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/divers.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/thumbs.c
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_action_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_boid_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_camera_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_cloth_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_color_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_controller_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_defs.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_documentation.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_effect_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_fileglobal_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_genfile.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_gpencil_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_group_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_image_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_lamp_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_listBase.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_nla_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_fluidsim.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_force.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_packedFile_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_property_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sdna_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sensor_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_smoke_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_sound_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_speaker_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_text_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_vec_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_vfont_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_view2d_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_world_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-cucumber/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_define.h
    branches/soc-2011-cucumber/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/makesrna/intern/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_movieclip.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_property.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-cucumber/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-cucumber/source/blender/modifiers/SConscript
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-cucumber/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/nodes/NOD_composite.h
    branches/soc-2011-cucumber/source/blender/nodes/NOD_shader.h
    branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-cucumber/source/blender/nodes/intern/node_common.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/soc-2011-cucumber/source/blender/python/SConscript
    branches/soc-2011-cucumber/source/blender/python/generic/bgl.c
    branches/soc-2011-cucumber/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-cucumber/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/python/intern/bpy.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface_atexit.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_intern_string.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_library.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_traceback.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_util.c
    branches/soc-2011-cucumber/source/blender/python/intern/gpu.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2011-cucumber/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-cucumber/source/blender/quicktime/apple/qtkit_import.m
    branches/soc-2011-cucumber/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2011-cucumber/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2011-cucumber/source/blender/quicktime/quicktime_export.h
    branches/soc-2011-cucumber/source/blender/render/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/renderpipeline.h
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/external_engine.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/strand.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-cucumber/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-cucumber/source/creator/CMakeLists.txt
    branches/soc-2011-cucumber/source/creator/creator.c
    branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/soc-2011-cucumber/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2011-cucumber/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2011-cucumber/source/gameengine/Expressions/Operator1Expr.cpp
    branches/soc-2011-cucumber/source/gameengine/Expressions/Operator2Expr.cpp
    branches/soc-2011-cucumber/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2011-cucumber/source/gameengine/Expressions/StringValue.h
    branches/soc-2011-cucumber/source/gameengine/Expressions/Value.cpp
    branches/soc-2011-cucumber/source/gameengine/Expressions/Value.h
    branches/soc-2011-cucumber/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2011-cucumber/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PyMath.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2011-cucumber/source/tests/CMakeLists.txt

Added Paths:
-----------
    branches/soc-2011-cucumber/intern/cycles/app/io_export_cycles_xml.py
    branches/soc-2011-cucumber/intern/cycles/blender/CCL_api.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_checker.h
    branches/soc-2011-cucumber/intern/dualcon/
    branches/soc-2011-cucumber/intern/dualcon/CMakeLists.txt
    branches/soc-2011-cucumber/intern/dualcon/SConscript
    branches/soc-2011-cucumber/intern/dualcon/dualcon.h
    branches/soc-2011-cucumber/intern/dualcon/intern/
    branches/soc-2011-cucumber/intern/dualcon/intern/GeoCommon.h
    branches/soc-2011-cucumber/intern/dualcon/intern/MemoryAllocator.h
    branches/soc-2011-cucumber/intern/dualcon/intern/ModelReader.h
    branches/soc-2011-cucumber/intern/dualcon/intern/Projections.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/Projections.h
    branches/soc-2011-cucumber/intern/dualcon/intern/Queue.h
    branches/soc-2011-cucumber/intern/dualcon/intern/cubes.h
    branches/soc-2011-cucumber/intern/dualcon/intern/dualcon_c_api.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/manifold_table.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/manifold_table.h
    branches/soc-2011-cucumber/intern/dualcon/intern/marching_cubes_table.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/marching_cubes_table.h
    branches/soc-2011-cucumber/intern/dualcon/intern/octree.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/octree.h
    branches/soc-2011-cucumber/intern/dualcon/intern/readme.txt
    branches/soc-2011-cucumber/release/scripts/modules/rna_xml.py
    branches/soc-2011-cucumber/release/scripts/presets/tracking_track_color/object.py
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_array.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_md5.h
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/md5.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_remesh.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_ffmpeg.h
    branches/soc-2011-cucumber/source/blender/render/intern/include/render_result.h
    branches/soc-2011-cucumber/source/blender/render/intern/source/render_result.c
    branches/soc-2011-cucumber/source/tests/bl_mesh_modifiers.py
    branches/soc-2011-cucumber/source/tests/bl_pyapi_mathutils.py

Removed Paths:
-------------
    branches/soc-2011-cucumber/intern/dualcon/CMakeLists.txt
    branches/soc-2011-cucumber/intern/dualcon/SConscript
    branches/soc-2011-cucumber/intern/dualcon/dualcon.h
    branches/soc-2011-cucumber/intern/dualcon/intern/
    branches/soc-2011-cucumber/intern/dualcon/intern/GeoCommon.h
    branches/soc-2011-cucumber/intern/dualcon/intern/MemoryAllocator.h
    branches/soc-2011-cucumber/intern/dualcon/intern/ModelReader.h
    branches/soc-2011-cucumber/intern/dualcon/intern/Projections.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/Projections.h
    branches/soc-2011-cucumber/intern/dualcon/intern/Queue.h
    branches/soc-2011-cucumber/intern/dualcon/intern/cubes.h
    branches/soc-2011-cucumber/intern/dualcon/intern/dualcon_c_api.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/manifold_table.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/manifold_table.h
    branches/soc-2011-cucumber/intern/dualcon/intern/marching_cubes_table.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/marching_cubes_table.h
    branches/soc-2011-cucumber/intern/dualcon/intern/octree.cpp
    branches/soc-2011-cucumber/intern/dualcon/intern/octree.h
    branches/soc-2011-cucumber/intern/dualcon/intern/readme.txt
    branches/soc-2011-cucumber/source/blender/imbuf/intern/md5.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/md5.h

Property Changed:
----------------
    branches/soc-2011-cucumber/
    branches/soc-2011-cucumber/build_files/
    branches/soc-2011-cucumber/doc/
    branches/soc-2011-cucumber/extern/
    branches/soc-2011-cucumber/intern/
    branches/soc-2011-cucumber/release/
    branches/soc-2011-cucumber/source/blender/
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:36829-40545,40632-42742
/trunk/blender/source/darwin:41227-41228
   + /branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:36829-40545,40632-43270
/trunk/blender/source/darwin:41227-41228

Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt	2012-01-11 01:09:00 UTC (rev 43274)
+++ branches/soc-2011-cucumber/CMakeLists.txt	2012-01-11 02:13:09 UTC (rev 43275)
@@ -156,6 +156,7 @@
 
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
+	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	OFF)
 	option(WITH_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)
@@ -169,6 +170,7 @@
 option(WITH_MOD_SMOKE        	"Enable Smoke Modifier (Smoke Simulation)" ON)
 option(WITH_MOD_DECIMATE       	"Enable Decimate Modifier" ON)
 option(WITH_MOD_BOOLEAN        	"Enable Boolean Modifier" ON)
+option(WITH_MOD_REMESH        	"Enable Remesh Modifier" ON)
 option(WITH_MOD_CLOTH_ELTOPO   	"Enable Experemental cloth solver" OFF)
 mark_as_advanced(WITH_MOD_CLOTH_ELTOPO)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
@@ -268,8 +270,8 @@
 	message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
 endif()
 
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
-	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
+	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
 endif()
 
 # python module, needs some different options
@@ -281,10 +283,12 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
-if(WITH_CODEC_QUICKTIME AND MINGW)
-	message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
-						"because it is currently unsupported, remove this "
-						"line if youre a developer who wants to add support.")
+if(MINGW)
+	if(WITH_CODEC_QUICKTIME)
+		message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+							"because it is currently unsupported, remove this "
+							"line if youre a developer who wants to add support.")
+	endif()
 endif()
 
 if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
@@ -581,6 +585,17 @@
 		if(WITH_X11_XINPUT)
 			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
 		endif()
+
+		if(WITH_X11_XF86VMODE)
+			# XXX, why dont cmake make this available?
+			FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
+			mark_as_advanced(X11_Xxf86vmode_LIB)
+			if(X11_Xxf86vmode_LIB)
+				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xxf86vmode_LIB}")
+			else()
+				set(WITH_X11_XF86VMODE OFF)
+			endif()
+		endif()
 	endif()
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -658,7 +673,7 @@
 	if(WITH_OPENAL)
 		set(OPENAL ${LIBDIR}/openal)
 		set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-		set(OPENAL_LIBRARY wrap_oal)
+		set(OPENAL_LIBRARY OpenAL32)
 		set(OPENAL_LIBPATH ${OPENAL}/lib)
 	endif()
 
@@ -696,8 +711,8 @@
 
 		add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
 
-		set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
-		set(CMAKE_C_FLAGS   "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_C_FLAGS   "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
 
 		if(CMAKE_CL_64)
 			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -763,22 +778,27 @@
 				${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
+			
+			set_lib_path(OPENCOLLADA_LIBPATH "opencollada/lib")
 
 			set(OPENCOLLADA_LIBRARIES
-				${LIBDIR}/opencollada/lib/OpenCOLLADASaxFrameworkLoader.lib
-				${LIBDIR}/opencollada/lib/OpenCOLLADAFramework.lib
-				${LIBDIR}/opencollada/lib/OpenCOLLADABaseUtils.lib
-				${LIBDIR}/opencollada/lib/OpenCOLLADAStreamWriter.lib
-				${LIBDIR}/opencollada/lib/MathMLSolver.lib
-				${LIBDIR}/opencollada/lib/GeneratedSaxParser.lib
-				${LIBDIR}/opencollada/lib/xml2.lib
-				${LIBDIR}/opencollada/lib/buffer.lib
-				${LIBDIR}/opencollada/lib/ftoa.lib
-				${LIBDIR}/opencollada/lib/UTF.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib
+				${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib
+				${OPENCOLLADA_LIBPATH}/MathMLSolver.lib
+				${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib
+				${OPENCOLLADA_LIBPATH}/xml2.lib
+				${OPENCOLLADA_LIBPATH}/buffer.lib
+				${OPENCOLLADA_LIBPATH}/ftoa.lib
+				${OPENCOLLADA_LIBPATH}/UTF.lib
 			)
 			set(PCRE_LIBRARIES
-				${LIBDIR}/opencollada/lib/pcre.lib
+				${OPENCOLLADA_LIBPATH}/pcre.lib
 			)
+			
+			unset(OPENCOLLADA_LIBPATH)
+			
 		endif()
 
 		if(WITH_CODEC_FFMPEG)
@@ -796,18 +816,8 @@
 		endif()
 
 		if(WITH_IMAGE_OPENEXR)
-			if(MSVC90)
-				set(MSVC_LIB _vs2008)
-				set(MSVC_INC)
-			elseif(MSVC10)
-				set(MSVC_LIB _vs2010)
-				set(MSVC_INC _vs2010)
-			else()
-				set(MSVC_LIB msvc)
-				set(MSVC_INC)
-			endif()
-			set(OPENEXR ${LIBDIR}/openexr)
-			set(OPENEXR_LIBPATH ${OPENEXR}/lib${MSVC_LIB})
+			set_lib_path(OPENEXR "openexr")
+			set_lib_path(OPENEXR_LIBPATH "openexr/lib")
 			set(OPENEXR_LIBRARIES
 				${OPENEXR_LIBPATH}/Iex.lib
 				${OPENEXR_LIBPATH}/Half.lib
@@ -815,7 +825,7 @@
 				${OPENEXR_LIBPATH}/Imath.lib
 				${OPENEXR_LIBPATH}/IlmThread.lib
 			)
-			set(OPENEXR_INCUDE ${OPENEXR}/include${MSVC_INC})
+			set_lib_path(OPENEXR_INCUDE "openexr/include")
 			set(OPENEXR_INCLUDE_DIRS
 				${OPENEXR_INCUDE}
 				${OPENEXR_INCUDE}/IlmImf
@@ -842,9 +852,9 @@
 		if(WITH_PYTHON)
 			# normally cached but not since we include them with blender
 			set(PYTHON_VERSION 3.2) # CACHE STRING)
-			set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
-			set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
-
+			set_lib_path(PYTHON_INCLUDE_DIR "python/include/python${PYTHON_VERSION}")
+			set_lib_path(PYTHON_LIBRARY "python/lib/python32.lib") #CACHE FILEPATH)
+			
 			# uncached vars
 			set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
 			set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
@@ -877,7 +887,7 @@
 			set(OPENIMAGEIO ${LIBDIR}/openimageio)
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
-			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+			set_lib_path(OPENIMAGEIO_LIBPATH "openimageio/lib")
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
@@ -1016,9 +1026,13 @@
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
-
+		
 		set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
 
+		## DISABLE - causes linking errors 
+		## for re-distrobution, so users dont need mingw installed
+		# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")
+
 	endif()
 
 	# used in many places so include globally, like OpenGL
@@ -1395,8 +1409,11 @@
 
 	# disable because it gives warnings for printf() & friends.
 	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 
+	if(NOT APPLE)
+		ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+	endif()
+
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
@@ -1407,8 +1424,11 @@
 	# flags to undo strict flags
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
 
+	if(NOT APPLE)
+		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+	endif()
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -1429,11 +1449,9 @@
 if(MSVC10)
 	if(WITH_IMAGE_OPENEXR)
 		message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
-		set(WITH_IMAGE_OPENEXR OFF)
 	endif()
 	if(WITH_OPENCOLLADA)
 		message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
-		set(WITH_OPENCOLLADA OFF)
 	endif()
 endif()
 
@@ -1545,6 +1563,7 @@
 
 	info_cfg_text("System Options:")
 	info_cfg_option(WITH_INSTALL_PORTABLE)
+	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
 	info_cfg_option(WITH_BUILTIN_GLEW)
 
@@ -1575,6 +1594,7 @@
 
 	info_cfg_text("Modifiers:")
 	info_cfg_option(WITH_MOD_BOOLEAN)
+	info_cfg_option(WITH_MOD_REMESH)
 	info_cfg_option(WITH_MOD_DECIMATE)
 	info_cfg_option(WITH_MOD_FLUID)
 	info_cfg_option(WITH_MOD_OCEANSIM)

Modified: branches/soc-2011-cucumber/SConstruct
===================================================================
--- branches/soc-2011-cucumber/SConstruct	2012-01-11 01:09:00 UTC (rev 43274)

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list