Campbell Barton 74c6c91ba6 svn merge ^/trunk/blender -r42080:42095

2011-11-23 17:14:27 +00:00

..

CMakeLists.txt

svn merge ^/trunk/blender -r41226:41227 .

2011-10-24 12:43:08 +00:00

object_add.c

svn merge -r41847:41899 ^/trunk/blender

2011-11-16 03:10:15 +00:00

object_bake.c

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +00:00

object_constraint.c

Attempted bugfix to improve behaviour of inverse calculations for ChildOf

2011-11-22 11:51:12 +00:00

object_edit.c

svn merge ^/trunk/blender -r42009:42053

2011-11-22 11:51:42 +00:00

object_group.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

object_hook.c

svn merge -r41751:41779 ^/trunk/blender

2011-11-15 02:05:32 +00:00

object_intern.h

svn merge -r41779:41847 ^/trunk/blender

2011-11-15 02:58:06 +00:00

object_lattice.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

object_modifier.c

svn merge ^/trunk/blender -r42080:42095

2011-11-23 17:14:27 +00:00

object_ops.c

svn merge -r41847:41899 ^/trunk/blender

2011-11-16 03:10:15 +00:00

object_relations.c

svn merge ^/trunk/blender -r42080:42095

2011-11-23 17:14:27 +00:00

object_select.c

correct indentation and some whitespace edits (no functional changes)

2011-11-11 13:09:14 +00:00

object_shapekey.c

uncomment shape key mirror.

2011-10-28 14:17:27 +00:00

object_transform.c

svn merge -r41575:41602 ^/trunk/blender

2011-11-07 07:01:24 +00:00

object_vgroup.c

svn merge ^/trunk/blender -r42080:42095

2011-11-23 17:14:27 +00:00

SConscript

svn merge ^/trunk/blender -r40587:40643

2011-09-28 07:34:48 +00:00