Tamito Kajiyama 065605e0da Merged changes in the trunk up to revision 48893. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

2012-07-13 23:23:06 +00:00

..

buttons_context.c

style cleanup: use TRUE/FALSE for ui align args.

2012-06-19 23:08:16 +00:00

buttons_header.c

style cleanup: use c style comments in C code

2012-07-06 23:56:59 +00:00

buttons_intern.h

style cleanup: animation + buttons

2012-05-08 15:30:00 +00:00

buttons_ops.c

style cleanup: animation + buttons

2012-05-08 15:30:00 +00:00

buttons_texture.c

Fix #31093: Brush's "Paint curve presets" in Image paint in UV\Image Editor doesn't work if weight paint mode is active

2012-06-04 07:29:45 +00:00

CMakeLists.txt

Fix for yesterday i18n own commit (r44924): we now need to define WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!).

2012-03-17 12:07:58 +00:00

SConscript

Fix for yesterday i18n own commit (r44924): we now need to define WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!).

2012-03-17 12:07:58 +00:00

space_buttons.c

Merged changes in the trunk up to revision 48227.

2012-06-24 10:29:26 +00:00