Tamito Kajiyama 3197796cf7 Merged changes in the trunk up to revision 42425. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

2011-12-05 02:12:49 +00:00

..

generic

missed removing these files

2011-11-29 10:34:23 +00:00

intern

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

mathutils

formatting edits (120 width max) and remove some redundant casts

2011-11-29 20:22:35 +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 41768.

2011-11-12 23:12:30 +00:00

simple_enum_gen.py

Space types:

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