diff options
| author | Joshua Leung <aligorith@gmail.com> | 2011-01-13 09:14:14 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2011-01-13 09:14:14 +0300 |
| commit | 4b922c0bf3c095087a7ee40fa6fe7056bbc6b537 (patch) | |
| tree | 220cb42a7e8b319284d1625e076b0ae2f3855e8e /source/blender/editors/animation | |
| parent | 6a9d93a339478fb5f052001ad38e30aa26b0f2ea (diff) | |
Bugfix [#25597] Grease Pencil crash when undoing during a Sketching
Session
As the key combination for undo was unhandled by Grease Pencil
operator and allowed to execute, some of the lingering Grease Pencil
data would get corrupted by undo as some flags may still have been
set.
This commit attempts to fix.workaround this problem by catching undo
events, using the internal "delete last stroke" functionality to
emulate undo-like behaviour as expected but without the associated
risks. The underlying functionality used was already part of the
original 2.4 implementation, but was exposed via the GUI instead there
where it was less useful.
---
Other tweaks related to Grease Pencil:
1) Spacebar can be used to end Sketching Sessions too now
2) Grease Pencil animation editor now displays GP datablocks in light
blue (i.e. "sub-id") colours as per dopesheet instead of them being
presented like groups. This better reflects their true nature.
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index a6d80763718..b2ee2f008f5 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -2412,11 +2412,8 @@ static bAnimChannelType ACF_SHAPEKEY= /* get backdrop color for gpencil datablock widget */ static void acf_gpd_color(bAnimContext *UNUSED(ac), bAnimListElem *UNUSED(ale), float *color) { - /* highlight only for datablock channels */ - //if (ale->flag & AGRP_ACTIVE) - // UI_GetThemeColorShade3fv(TH_GROUP_ACTIVE, 10, color); - //else - UI_GetThemeColorShade3fv(TH_GROUP, 20, color); + /* these are ID-blocks, but not exactly standalone... */ + UI_GetThemeColorShade3fv(TH_DOPESHEET_CHANNELSUBOB, 20, color); } // TODO: just get this from RNA? |