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 1f7ae143a2 Merged changes in the trunk up to revision 48227. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c

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

..

anim_channels_defines.c

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +00:00

anim_channels_edit.c

Merged changes in the trunk up to revision 47700.

2012-06-10 20:50:43 +00:00

anim_deps.c

- dont create scene.sequence_editor on read, means data-browser or autocomplete will allocate a sequencer.

2012-05-11 10:04:55 +00:00

anim_draw.c

style cleanup: whitespace/indentation

2012-05-19 13:55:54 +00:00

anim_filter.c

Merged changes in the trunk up to revision 48227.

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

anim_intern.h

style cleanup: animation + buttons

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

anim_ipo_utils.c

add vector versions of hsv_to_rgb, rgb_to_hsv & rgb_to_hsv_compat

2012-05-26 11:01:01 +00:00

anim_markers.c

style cleanup: animation + buttons

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

anim_ops.c

style cleanup: animation + buttons

2012-05-08 15:30:00 +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

style cleanup

2012-05-27 19:40:36 +00:00

fmodifier_ui.c

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

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

keyframes_draw.c

mask animation keys now editable in the dope sheet (duplicate, transform, delete, select- etc).

2012-06-08 14:31:38 +00:00

keyframes_edit.c

style cleanup: defines with braces

2012-05-27 20:13:59 +00:00

keyframes_general.c

style cleanup:

2012-06-17 09:58:26 +00:00

keyframing.c

Bugfix [#31843] Inserting of visual keys for Damped Track constraint broken

2012-06-16 13:51:18 +00:00

keyingsets.c

style cleanup: animation + buttons

2012-05-08 15:30:00 +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