Tamito Kajiyama 31471f644c Merged changes in the trunk up to revision 36551. ...

Conflicts resolved:
source/creator/SConscript

2011-05-09 01:38:29 +00:00

..

generic

converted more mixed tab/space indentations to tabs. only whitespace changes.

2011-04-21 15:53:30 +00:00

intern

Merged changes in the trunk up to revision 36551.

2011-05-09 01:38:29 +00:00

BPY_extern.h

change unit evaluation only to do try the units replacements if evaluating with python fails, in rare cases its possible a valid python expression could get units applied to it.

2011-04-17 12:47:20 +00:00

CMakeLists.txt

use lowercase for cmake builtin names and macros, remove contents in else() and endif() which is no longer needed.

2010-12-08 08:43:06 +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 35972.

2011-04-03 12:46:33 +00:00

simple_enum_gen.py

correct fsf address

2010-02-12 13:34:04 +00:00