Tamito Kajiyama 9c42afb1c0 Merged changes in the trunk up to revision 40413. ...

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

2011-09-20 21:22:15 +00:00

..

generic

have blf.gettext even when internationalization is disabled (just passes through).

2011-09-20 15:11:17 +00:00

intern

Merged changes in the trunk up to revision 40413.

2011-09-20 21:22:15 +00:00

mathutils

edits to argument parsing for Euler.rotate_axis, also corrected some exception messages and minor style edits.

2011-09-19 15:13:16 +00:00

BPY_extern.h

own patch [#27752] Python Callback (Scriptlink functionality)

2011-06-24 16:54:30 +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 40413.

2011-09-20 21:22:15 +00:00

simple_enum_gen.py

correct fsf address

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