Campbell Barton 121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

..

CMakeLists.txt

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

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

SConscript

svn merge ^/trunk/blender -r40394:40395

2011-09-23 10:43:25 +00:00

transform_constraints.c

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

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

transform_conversions.c

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

2011-11-10 04:17:43 +00:00

transform_generics.c

svn merge -r41638:41648 ^/trunk/blender

2011-11-10 01:50:22 +00:00

transform_input.c

replace VECCOPY with copy_v3_v3, same for 2d copy, also added vec copy functions for int & char.

2011-11-07 01:38:32 +00:00

transform_manipulator.c

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

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

transform_ops.c

Camera tracking integration

2011-11-07 12:55:18 +00:00

transform_orientations.c

svn merge -r41575:41602 ^/trunk/blender

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

transform_snap.c

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

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

transform.c

svn merge -r41638:41648 ^/trunk/blender

2011-11-10 01:50:22 +00:00

transform.h

svn merge ^/trunk/blender -r41602:41638 .

2011-11-08 02:57:28 +00:00