Tamito Kajiyama 831f339980 Merged changes in the trunk up to revision 43748. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h

2012-01-29 12:00:04 +00:00

..

generic

Longer names support for all ID and other object names

2012-01-11 08:51:06 +00:00

intern

Merged changes in the trunk up to revision 43585.

2012-01-21 23:01:25 +00:00

mathutils

Add the .Identity() classmethod to mathutils matrices. This allows the user

2012-01-24 01:56:44 +00:00

BPY_extern.h

pydrivers: 'frame' is now in the driver namespace,

2011-11-17 07:08:09 +00:00

CMakeLists.txt

move mathutils into its own lib.

2011-07-15 04:01:47 +00:00

rna_dump.py

mathutils.Matrix.OrthoProjection(plane, size, axis), merged axis and plane args. since axis was only allowed when plane was 'R'.

2011-02-04 09:35:20 +00:00

SConscript

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

simple_enum_gen.py

Space types:

2011-11-01 20:14:58 +00:00