diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /source/blender/editors/space_sequencer/sequencer_buttons.c | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_buttons.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_buttons.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.c b/source/blender/editors/space_sequencer/sequencer_buttons.c index d75eeca2c67..70c6da0bfb3 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.c +++ b/source/blender/editors/space_sequencer/sequencer_buttons.c @@ -46,12 +46,12 @@ #include "WM_api.h" #include "WM_types.h" -#include "UI_interface.h" #include "sequencer_intern.h" /* **************************** buttons ********************************* */ +#if 0 static int sequencer_grease_pencil_panel_poll(const bContext *C, PanelType *UNUSED(pt)) { SpaceSeq *sseq = CTX_wm_space_seq(C); @@ -59,9 +59,11 @@ static int sequencer_grease_pencil_panel_poll(const bContext *C, PanelType *UNUS /* don't show the gpencil if we are not showing the image */ return ED_space_sequencer_check_show_imbuf(sseq); } +#endif -void sequencer_buttons_register(ARegionType *art) +void sequencer_buttons_register(ARegionType *UNUSED(art)) { +#if 0 PanelType *pt; pt = MEM_callocN(sizeof(PanelType), "spacetype sequencer panel gpencil"); @@ -72,6 +74,7 @@ void sequencer_buttons_register(ARegionType *art) pt->draw = ED_gpencil_panel_standard; pt->poll = sequencer_grease_pencil_panel_poll; BLI_addtail(&art->paneltypes, pt); +#endif } /* **************** operator to open/close properties view ************* */ |