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

Antony Riakiotakis kalast at gmail.com
Wed Dec 28 19:18:51 CET 2011


Revision: 42944
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42944
Author:   psy-fi
Date:     2011-12-28 18:18:48 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Merge with trunk r42942

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

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/SConstruct
    branches/soc-2011-onion-uv-tools/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
    branches/soc-2011-onion-uv-tools/doc/python_api/rst/change_log.rst
    branches/soc-2011-onion-uv-tools/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_test.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/engine.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_python.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_session.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_session.h
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-onion-uv-tools/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-onion-uv-tools/intern/cycles/render/integrator.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/render/integrator.h
    branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_C-api.h
    branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-onion-uv-tools/intern/ghost/GHOST_IWindow.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_Debug.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_DisplayManager.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_EventKey.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_EventNDOF.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_EventTrackpad.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_TimerTask.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_Window.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-onion-uv-tools/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2011-onion-uv-tools/intern/iksolver/intern/IK_Solver.cpp
    branches/soc-2011-onion-uv-tools/intern/mikktspace/mikktspace.c
    branches/soc-2011-onion-uv-tools/intern/opennl/intern/opennl.c
    branches/soc-2011-onion-uv-tools/intern/opennl/superlu/get_perm_c.c
    branches/soc-2011-onion-uv-tools/intern/opennl/superlu/scolumn_bmod.c
    branches/soc-2011-onion-uv-tools/intern/opennl/superlu/strsv.c
    branches/soc-2011-onion-uv-tools/intern/opennl/superlu/sutil.c
    branches/soc-2011-onion-uv-tools/intern/opennl/superlu/util.h
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/bpy_extras/view3d_utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/sys_info.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/DV.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/DVD.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/SVCD.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/ffmpeg/VCD.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/sequencer.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-onion-uv-tools/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_colortools.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/depsgraph_private.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/idprop.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/object.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/unit.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeavi.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_color.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/edgehash.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_color.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/storage.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/BLO_sys_types.h
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_filter.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/view2d.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_internal.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_opengl.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/glutil.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_codegen.h
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-onion-uv-tools/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-onion-uv-tools/source/blender/imbuf/intern/divers.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_ID.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_defs.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_documentation.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_genfile.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_material_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_define.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-onion-uv-tools/source/blender/python/SConscript
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/bgl.c
    branches/soc-2011-onion-uv-tools/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface_atexit.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_intern_string.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_library.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_operator.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_props.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_traceback.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_util.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/gpu.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Euler.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.h
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-onion-uv-tools/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2011-onion-uv-tools/source/blender/quicktime/quicktime_export.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/strand.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/creator/creator.c
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_PyMath.h
    branches/soc-2011-onion-uv-tools/source/tests/bl_pyapi_mathutils.py

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/intern/cycles/app/io_export_cycles_xml.py
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_array.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_app_ffmpeg.h

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_md5.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42802
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39665-42942

Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt	2011-12-28 18:18:48 UTC (rev 42944)
@@ -281,10 +281,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)
@@ -658,7 +660,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()
 

Modified: branches/soc-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/SConstruct	2011-12-28 18:18:48 UTC (rev 42944)
@@ -756,7 +756,6 @@
 
     if env['WITH_BF_OPENAL']:
         dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
-        dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
 
     if env['WITH_BF_SNDFILE']:
         dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/linuxcross-config.py	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/linuxcross-config.py	2011-12-28 18:18:48 UTC (rev 42944)
@@ -13,7 +13,7 @@
 WITH_BF_STATICOPENAL = False
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 # Warning, this static lib configuration is untested! users of this OS please confirm.
 BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-mingw-config.py	2011-12-28 18:18:48 UTC (rev 42944)
@@ -14,7 +14,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = True

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win32-vc-config.py	2011-12-28 18:18:48 UTC (rev 42944)
@@ -20,7 +20,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_ICONV = True

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/config/win64-vc-config.py	2011-12-28 18:18:48 UTC (rev 42944)
@@ -20,7 +20,7 @@
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include '
-BF_OPENAL_LIB = 'wrap_oal'
+BF_OPENAL_LIB = 'OpenAL32'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SNDFILE = True

Modified: branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py	2011-12-28 18:18:48 UTC (rev 42944)
@@ -159,7 +159,8 @@
             'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC',
             'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
             'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
-            'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH'
+            'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
+            'WITH_BF_LIBMV'
             ]
     
     # Have options here that scons expects to be lists

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/rst/change_log.rst
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/python_api/rst/change_log.rst	2011-12-28 18:17:26 UTC (rev 42943)
+++ branches/soc-2011-onion-uv-tools/doc/python_api/rst/change_log.rst	2011-12-28 18:18:48 UTC (rev 42944)
@@ -1480,3 +1480,640 @@
 * :class:`bpy.types.SceneGameData.restrict_animation_updates`
 * :class:`bpy.types.SceneGameData.show_obstacle_simulation`
 
+
+2.60 to 2.61
+============
+
+bpy.types.BlendDataGroups
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataGroups.is_updated`
+
+bpy.types.BlendDataBrushes
+--------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataBrushes.is_updated`
+
+bpy.types.Theme
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Theme.clip_editor`
+
+bpy.types.BlendData
+-------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendData.movieclips`
+
+bpy.types.BlendDataGreasePencils
+--------------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataGreasePencils.is_updated`
+
+bpy.types.BlendDataImages
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataImages.is_updated`
+
+bpy.types.CompositorNodes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.CompositorNodes.clear`
+
+bpy.types.BlendDataScenes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataScenes.is_updated`
+
+bpy.types.RenderEngine
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderEngine.bl_use_shading_nodes`
+* :class:`bpy.types.RenderEngine.is_animation`
+* :class:`bpy.types.RenderEngine.is_preview`
+* :class:`bpy.types.RenderEngine.tag_redraw`
+* :class:`bpy.types.RenderEngine.tag_update`
+* :class:`bpy.types.RenderEngine.update`
+* :class:`bpy.types.RenderEngine.update_progress`
+* :class:`bpy.types.RenderEngine.view_draw`
+* :class:`bpy.types.RenderEngine.view_update`
+
+bpy.types.BackgroundImage
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BackgroundImage.clip`
+* :class:`bpy.types.BackgroundImage.clip_user`
+* :class:`bpy.types.BackgroundImage.show_background_image`
+* :class:`bpy.types.BackgroundImage.source`
+* :class:`bpy.types.BackgroundImage.use_camera_clip`
+
+bpy.types.BlendDataMetaBalls
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMetaBalls.is_updated`
+
+bpy.types.SpaceTimeline
+-----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.SpaceTimeline.cache_dynamicpaint`
+
+bpy.types.BlendDataMeshes
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataMeshes.is_updated`
+
+bpy.types.BlendDataNodeTrees
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataNodeTrees.is_updated`
+
+bpy.types.RenderSettings
+------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderSettings.image_settings`
+* :class:`bpy.types.RenderSettings.use_shading_nodes`
+
+Removed
+^^^^^^^
+
+* **cineon_black**
+* **cineon_gamma**
+* **cineon_white**
+* **color_mode**
+* **exr_codec**
+* **exr_preview**
+* **exr_zbuf**
+* **file_format**
+* **file_quality**
+* **jpeg2k_depth**
+* **jpeg2k_preset**
+* **jpeg2k_ycc**
+* **use_cineon_log**
+* **use_exr_half**
+* **use_tiff_16bit**
+
+bpy.types.Curve
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Curve.cycles`
+
+bpy.types.RegionView3D
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RegionView3D.view_camera_offset`
+* :class:`bpy.types.RegionView3D.view_camera_zoom`
+
+bpy.types.Scene
+---------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Scene.active_clip`
+* :class:`bpy.types.Scene.cycles`
+
+bpy.types.NodeLinks
+-------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.NodeLinks.clear`
+
+bpy.types.BlendDataLattices
+---------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataLattices.is_updated`
+
+bpy.types.BlendDataParticles
+----------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataParticles.is_updated`
+
+bpy.types.BlendDataWorlds
+-------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.BlendDataWorlds.is_updated`
+
+bpy.types.ObjectConstraints
+---------------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.ObjectConstraints.clear`
+
+bpy.types.RenderLayers
+----------------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.RenderLayers.new`
+* :class:`bpy.types.RenderLayers.remove`
+
+bpy.types.Menu
+--------------
+
+Added
+^^^^^
+
+* :class:`bpy.types.Menu.bl_description`
+
+bpy.types.Lamp
+--------------
+
+Added
+^^^^^
+

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list