Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c

2012-10-20 16:48:48 +00:00

..

bmesh

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

generic

optimization for PyObject -> ID-property sequence conversion, use PySequence_Fast.

2012-10-12 03:59:50 +00:00

intern

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00

mathutils

code cleanup: use float sizes for function args.

2012-10-15 23:11:59 +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

style cleanup: pep8

2012-10-08 10:03:01 +00:00

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