diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-13 01:01:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-13 01:01:39 +0400 |
| commit | 8115753fd280c4e23f9d86508184ed057a9a2099 (patch) | |
| tree | a68a1b0d219f3521a41a23ed1f358a530b388978 /source/blender/editors/space_view3d/view3d_toolbar.c | |
| parent | 80da50270dfd4c330302813aa3a92240a9361865 (diff) | |
| parent | 01478a3743f1d1fe3d641ff498953af027ca2e60 (diff) | |
svn merge ^/trunk/blender -r42564:42586
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_toolbar.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_toolbar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_toolbar.c b/source/blender/editors/space_view3d/view3d_toolbar.c index d226815a1de..cb6a53c67eb 100644 --- a/source/blender/editors/space_view3d/view3d_toolbar.c +++ b/source/blender/editors/space_view3d/view3d_toolbar.c @@ -96,6 +96,7 @@ static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wm } } +/* TODO de-duplicate redo panel functions - campbell */ static void view3d_panel_operator_redo(const bContext *C, Panel *pa) { wmOperator *op= WM_operator_last_redo(C); @@ -108,7 +109,7 @@ static void view3d_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 */ |