This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

..

anim_channels_defines.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

anim_channels_edit.c

Merged changes in the trunk up to revision 49797.

2012-08-12 00:09:57 +00:00

anim_deps.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

anim_draw.c

code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering

2012-08-08 18:37:06 +00:00

anim_filter.c

revert r50837, this assumption is made elsewhere (in transform_conversions.c), so better leave it for now, at least with r50836 mask datablocks display in the dope sheet by default now.

2012-09-24 01:36:31 +00:00

anim_intern.h

option to clear all keys from a button, so you dont have to hunt about for the keys inserted.

2012-07-17 15:16:44 +00:00

anim_ipo_utils.c

rename BLI_getQuotedStr --> BLI_str_quoted_substrN to make it more clear its doing an allocation.

2012-07-09 22:16:50 +00:00

anim_markers.c

style cleanup

2012-09-30 06:12:47 +00:00

anim_ops.c

utility functions for getting/setting rectangles for operators.

2012-08-08 20:38:55 +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

drivers.c

Followup for r.48515

2012-07-03 05:30:19 +00:00

fmodifier_ui.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

keyframes_draw.c

fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.

2012-09-14 06:17:14 +00:00

keyframes_edit.c

code cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our naming convention.

2012-08-23 18:25:45 +00:00

keyframes_general.c

code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.

2012-09-03 22:04:14 +00:00

keyframing.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

keyingsets.c

style cleanup: use c style comments in C code

2012-07-06 23:56:59 +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