Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

2012-03-25 08:20:19 +00:00

..

bmesh

code cleanup: move bmesh inline funcs to headers (avoids compiling the C files).

2012-03-24 01:24:58 +00:00

generic

style cleanup: pep8, indentation

2012-03-24 07:36:32 +00:00

intern

Merged changes in the trunk up to revision 45133.

2012-03-25 08:20:19 +00:00

mathutils

fix for Quaternion.to_axis_angle() returning a zero axis vector.

2012-03-20 23:37:54 +00:00

BPY_extern.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

CMakeLists.txt

initial bmesh python api.

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

rna_dump.py

Code Cleanup: check is / is not when comparing singletons.

2012-02-02 21:07:56 +00:00

SConscript

Merged changes in the trunk up to revision 44419.

2012-02-25 01:26:45 +00:00

simple_enum_gen.py

style cleanup: py/capi

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