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 53840c7db5 Merged changes in the trunk up to revision 52546. ...

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c

2012-11-26 02:32:34 +00:00

..

anim_channels_defines.c

Merged changes in the trunk up to revision 51853.

2012-11-04 02:22:56 +00:00

anim_channels_edit.c

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +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

Axis Colours are now Themeable

2012-11-09 06:36:11 +00:00

anim_filter.c

Merged changes in the trunk up to revision 52118.

2012-11-12 00:30:55 +00:00

anim_intern.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

anim_ipo_utils.c

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

anim_markers.c

Fix #33304: missing 3D view redraw while moving camera markers.

2012-11-25 16:52:42 +00:00

anim_ops.c

dragging the playhead now uses continuous grab.

2012-10-15 22:45:47 +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: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

fmodifier_ui.c

fix for possible buffer overflow in gpu_nodes_get_vertex_attributes() and hair_velocity_smoothing()

2012-11-01 09:56:18 +00:00

keyframes_draw.c

style cleanup: also rename bmesh_decimate.c --> bmesh_decimate_collapse.c

2012-10-23 03:38:26 +00:00

keyframes_edit.c

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

keyframes_general.c

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

keyframing.c

style cleanup

2012-10-29 02:11:40 +00:00

keyingsets.c

Display warning/info notification after adding properties to a Keying Set using

2012-11-06 05:25:55 +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