Tamito Kajiyama ce03ec4b86 Merged changes in the trunk up to revision 38543. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

2011-07-20 23:33:10 +00:00

..

generic

script to report deprecated functions of text and their age in days.

2011-07-18 09:49:26 +00:00

intern

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

mathutils

patch [#28032] swapped matrix multiplication order, reverse it back, tested with FBX, BVH import/export which are very sensitive to changes in matrix rotation.

2011-07-20 06:41:51 +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 38543.

2011-07-20 23:33:10 +00:00

simple_enum_gen.py

correct fsf address

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