Tamito Kajiyama a5152b7ca0 Merged changes in the trunk up to revision 46787. ...

Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c

2012-05-19 08:40:56 +00:00

..

bmesh

style cleanup: guys - set your editors to tabs!

2012-05-01 17:51:03 +00:00

generic

classic compile error: GLEW_STATIC needs to be define when we use opengl functions

2012-05-09 09:49:24 +00:00

intern

Merged changes in the trunk up to revision 46787.

2012-05-19 08:40:56 +00:00

mathutils

Style cleanup: displist module

2012-05-07 06:58:03 +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

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 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