svn merge ^/trunk/blender -r46340:46350
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 23:36:22 +0000 (23:36 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 23:36:22 +0000 (23:36 +0000)
commit9c09938b7a8f586985ced201e3ee05607b21678b
tree417d847bbe384b90edab38ace3d6f6bb1010a392
parent0f607cb2aa6d2d2033e9a237576713c37a359492
parentffed654ff2a1349b735026aafde6f8937a4a3f15
svn merge ^/trunk/blender -r46340:46350
14 files changed:
intern/cycles/kernel/kernel_types.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/text.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/windowmanager/intern/wm_operators.c