This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Campbell Barton 4ced91da47 svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +00:00

..

CMakeLists.txt

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

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

object_add.c

svn merge ^/trunk/blender -r42670:42680

2011-12-17 02:41:53 +00:00

object_bake.c

svn merge ^/trunk/blender -r42372:42416

2011-12-04 18:39:19 +00:00

object_constraint.c

Math lib: matrix multiplication order fix for two functions that were

2011-12-16 19:53:12 +00:00

object_edit.c

svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +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

use TRUE/FALSE rather then 1/0, no functional changes.

2011-12-21 03:33:32 +00:00

object_intern.h

svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +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 -r42778:42839

2011-12-23 08:41:53 +00:00

object_ops.c

svn merge ^/trunk/blender -r42778:42839

2011-12-23 08:41:53 +00:00

object_relations.c

svn merge ^/trunk/blender -r42660:42669

2011-12-16 23:26:29 +00:00

object_select.c

another possible fix for bug [#29521], all callers of flip_side_name(...), assumed it initialized the string however for 1-2 length names it returned without doing anything.

2011-12-09 07:35:56 +00:00

object_shapekey.c

uncomment shape key mirror.

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

object_transform.c

svn merge ^/trunk/blender -r42372:42416

2011-12-04 18:39:19 +00:00

object_vgroup.c

svn merge ^/trunk/blender -r42680:42722

2011-12-19 10:40:48 +00:00

SConscript

svn merge ^/trunk/blender -r40587:40643

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