Merging r50522 through r50572 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 13 Sep 2012 11:13:13 +0000 (11:13 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 13 Sep 2012 11:13:13 +0000 (11:13 +0000)
commitde7a57a242c5305216e917cb9ab3b870dd10de59
tree24c5894169b3416cbf81d622b57d2c1214e1dfec
parent4f9ee399c09f62e9e6c359ef03b9d016a11d089d
Merging r50522 through r50572 from trunk into soc-2011-tomato
89 files changed:
build_files/cmake/macros.cmake
extern/libmv/third_party/ceres/SConscript
extern/libmv/third_party/ceres/internal/ceres/collections_port.h
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_session.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_multi.cpp
intern/cycles/device/device_opencl.cpp
intern/cycles/render/session.cpp
intern/cycles/render/session.h
intern/cycles/util/util_opencl.cpp
intern/cycles/util/util_task.cpp
release/scripts/startup/bl_operators/screen_play_rendered_anim.py
release/scripts/startup/bl_operators/wm.py
source/blender/blenkernel/BKE_anim.h
source/blender/blenkernel/BKE_image.h
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/BKE_movieclip.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/mask_rasterize.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenlib/intern/math_geom.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_iterators.c
source/blender/bmesh/intern/bmesh_private.h
source/blender/bmesh/intern/bmesh_structure.c
source/blender/bmesh/operators/bmo_connect.c
source/blender/collada/DocumentExporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/ImageExporter.cpp
source/blender/compositor/intern/COM_NodeOperation.cpp
source/blender/compositor/operations/COM_CombineChannelsOperation.cpp
source/blender/compositor/operations/COM_CombineChannelsOperation.h
source/blender/editors/animation/anim_markers.c
source/blender/editors/include/ED_image.h
source/blender/editors/include/ED_mask.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/mask/mask_add.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/mask/mask_edit.c
source/blender/editors/mask/mask_ops.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_sensor.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_screw.c
source/blender/render/intern/source/imagetexture.c
source/blender/windowmanager/intern/wm_playanim.c
source/gameengine/Ketsji/KX_Scene.cpp
source/tests/bl_rna_wiki_reference.py [new file with mode: 0644]
source/tests/rna_info_dump.py