svn merge ^/trunk/blender -r46000:46100
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 6 May 2012 22:19:13 +0000 (22:19 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 6 May 2012 22:19:13 +0000 (22:19 +0000)
commit6c86b70145ee46b647061f4b6455c3e82268df36
tree629630f3cc6b6f44ffd5072da5dd81e57fd9861b
parent2ebebc563e2722ee08ffc0fb9204522964538df1
parent5fb53b6b301c5ed03cdb3f800bb4af9395369a8f
svn merge ^/trunk/blender -r46000:46100

some conflicts. had to backup my code, accept with "tc" and introduce my own code again.
Hope I didnt leave anything out.
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c