Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-12-13 15:58:59 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-12-13 15:58:59 +0400
commitb865c0314f4bd2ead240accff1d06234f614acd2 (patch)
tree61026809a1b3bebb7b2f0614912d4e37267da897 /source/blender/editors/space_clip
parent3717a4a9e1ef159ce9b75738cd40122bbd01671b (diff)
parent5466befb38cf4ba21e4cf97f0318aaa7f2b10938 (diff)
Merging r42533 through r42601 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_toolbar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_clip/clip_toolbar.c b/source/blender/editors/space_clip/clip_toolbar.c
index fe09c5cd829..941c12df4aa 100644
--- a/source/blender/editors/space_clip/clip_toolbar.c
+++ b/source/blender/editors/space_clip/clip_toolbar.c
@@ -212,6 +212,7 @@ static void clip_panel_operator_redo_operator(const bContext *C, Panel *pa, wmOp
}
}
+/* TODO de-duplicate redo panel functions - campbell */
static void clip_panel_operator_redo(const bContext *C, Panel *pa)
{
wmOperator *op= WM_operator_last_redo(C);
@@ -224,7 +225,7 @@ static void clip_panel_operator_redo(const bContext *C, Panel *pa)
block= uiLayoutGetBlock(pa->layout);
- if(ED_undo_valid(C, op->type->name)==0)
+ if (!WM_operator_check_ui_enabled(C, op->type->name))
uiLayoutSetEnabled(pa->layout, 0);
/* note, blockfunc is a default but->func, use Handle func to allow button callbacks too */