Merging r50576 through r50587 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Sep 2012 14:05:05 +0000 (14:05 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Sep 2012 14:05:05 +0000 (14:05 +0000)
commit58da4a1760028dbf4b7f0df78ed3d897ba5690c2
tree76a94a6a8e15fb2974d83b3962848a9e1cd92f41
parent5badefa8cfafe0f6989594dbf827997a7a8597a1
Merging r50576 through r50587 from trunk into soc-2011-tomato
37 files changed:
GNUmakefile
build_files/cmake/cmake_static_check_smatch.py [new file with mode: 0644]
intern/cycles/app/cycles_test.cpp
source/blender/avi/intern/avi.c
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/fmodifier.c
source/blender/blenkernel/intern/lattice.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/sequencer.c
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/armature/poselib.c
source/blender/editors/armature/poseobject.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/physics/particle_object.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_buttons/buttons_texture.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_group.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/util/ed_util.c
source/blender/imbuf/intern/filetype.c
source/blender/imbuf/intern/imbuf_cocoa.m [deleted file]
source/blender/imbuf/intern/iris.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/nodes/composite/node_composite_tree.c
source/blender/render/intern/source/convertblender.c
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp