Tamito Kajiyama 4172997675 Merged changes in the trunk up to revision 50607. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-09-15 00:15:24 +00:00

..

bmesh

style cleanup: whitespace

2012-08-26 11:35:43 +00:00

generic

style cleanup

2012-09-08 06:40:03 +00:00

intern

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

mathutils

fix bug in mathutils.geometry.intersect_point_line() where 4D vectors were treated as 2D.

2012-08-28 11:27:46 +00:00

BPY_extern.h

Python/context: python could get invalid bpy.data in scene update handler after

2012-05-08 22:07:06 +00:00

CMakeLists.txt

initial bmesh python api.

2012-02-22 09:19:53 +00:00

rna_dump.py

…

SConscript

Merged changes in the trunk up to revision 46557.

2012-05-11 22:48:41 +00:00

simple_enum_gen.py

style cleanup: py/capi

2012-03-16 21:39:56 +00:00