diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 17:16:43 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 17:16:43 +0300 |
| commit | b282716c3aae68d5fc781e7fc5df0241c3d91198 (patch) | |
| tree | b6c50064fe3a0c07341cd70cf9745ea3092c8fb7 /source/blender/editors/space_sequencer/space_sequencer.c | |
| parent | 459365443f62d2f8e8718c1d1b0fbaafd6d765de (diff) | |
| parent | 580741b317ae60eb3bf999d636da0325c7e67373 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_sequencer/space_sequencer.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/space_sequencer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 5dfcba9b4d1..3b04e6c80cd 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -436,7 +436,8 @@ static void sequencer_dropboxes(void) /* ************* end drop *********** */ -static const char *sequencer_context_dir[] = {"edit_mask", NULL}; +/* DO NOT make this static, this hides the symbol and breaks API generation script. */ +const char *sequencer_context_dir[] = {"edit_mask", NULL}; static int sequencer_context(const bContext *C, const char *member, bContextDataResult *result) { |