svn merge ^/trunk/blender -r46340:46350
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 23:27:27 +0000 (23:27 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 23:27:27 +0000 (23:27 +0000)
commit0f607cb2aa6d2d2033e9a237576713c37a359492
tree5846bee0ee69eb96a5c9cccf1d0e6f22f248f970
parent4ace1fbbccdef1be7d119f77ba47d869bc6067c6
parentfbf06d0f5d5f2990256c89598c825b4dfa7da063
svn merge ^/trunk/blender -r46340:46350
15 files changed:
source/blender/editors/mesh/editmesh_knife.c
source/blender/modifiers/intern/MOD_boolean_util.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_decimate.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_warp.c
source/blender/modifiers/intern/MOD_weightvgproximity.c