Tamito Kajiyama 16702c1729 Merged changes in the trunk up to revision 41225. ...

Conflicts resolved:
source/blender/render/intern/source/pipeline.c

2011-10-29 15:46:14 +00:00

..

generic

py api - added PyC_UnicodeFromByteAndSize() to match PyUnicode_FromStringAndSize()

2011-10-22 10:49:35 +00:00

intern

Merged changes in the trunk up to revision 41225.

2011-10-29 15:46:14 +00:00

mathutils

fix spelling mistakes in comments (and in some python error messages), nothing to effect translations.

2011-10-17 06:39:13 +00:00

BPY_extern.h

Code cleanup: don't use btempdir/bprogdir/bprogname globals anymore, but wrap

2011-10-21 17:37:38 +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 40911.

2011-10-10 21:15:11 +00:00

simple_enum_gen.py

correct fsf address

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