Merging r50502 through r50521 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 11 Sep 2012 09:13:57 +0000 (09:13 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 11 Sep 2012 09:13:57 +0000 (09:13 +0000)
commit777a49dfef19d954a000c5d7e422e8650c1854b5
tree939c105ece85f44b4170b4e5bdb03a80d4aa26e5
parent07082fb7d0506284108060479472e7126af5c087
Merging r50502 through r50521 from trunk into soc-2011-tomato
22 files changed:
intern/cycles/render/session.cpp
intern/string/STR_String.h
intern/string/intern/STR_String.cpp
release/scripts/startup/bl_ui/space_image.py
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenlib/intern/scanfill.c
source/blender/bmesh/intern/bmesh_core.c
source/blender/bmesh/intern/bmesh_iterators.c
source/blender/bmesh/intern/bmesh_iterators.h
source/blender/bmesh/intern/bmesh_queries.c
source/blender/editors/animation/keyframing.c
source/blender/editors/mesh/editmesh_bvh.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/transform/transform_conversions.c
source/blender/python/intern/bpy_interface.c
source/blender/windowmanager/intern/wm_files.c
source/gameengine/Rasterizer/RAS_MeshObject.cpp