diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-07 13:17:00 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-07 13:17:00 +0300 |
commit | 45a77ba09dbe8c51084c0aaa80f884a9954459cf (patch) | |
tree | 8c7746e16db023c4654ea0e0b5bd989d9f4e61b9 | |
parent | ebd7e87f33ffad86cad81dbe764fa7e424e42ce0 (diff) | |
parent | 3fed85f9d2cfcd120c58599e55b4518e62281ee1 (diff) |
Merge branch 'blender-v2.83-release'
-rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index fea4406cb8c..5bb2fe1a7e4 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -116,9 +116,9 @@ class AnnotationDrawingToolsPanel: col.label(text="Data Source:") row = col.row(align=True) if is_3d_view: - row.prop(context.tool_settings, "grease_pencil_source", expand=True) + row.prop(context.tool_settings, "annotation_source", expand=True) elif is_clip_editor: - row.prop(context.space_data, "grease_pencil_source", expand=True) + row.prop(context.space_data, "annotation_source", expand=True) gpencil_stroke_placement_settings(context, col) @@ -477,7 +477,7 @@ class AnnotationDataPanel: # Owner selector. if context.space_data.type == 'CLIP_EDITOR': - layout.row().prop(context.space_data, "grease_pencil_source", expand=True) + layout.row().prop(context.space_data, "annotation_source", expand=True) layout.template_ID(gpd_owner, "grease_pencil", new="gpencil.annotation_add", unlink="gpencil.data_unlink") diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index e1f675871ef..272e67752f2 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1973,7 +1973,9 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel): col.prop(st, "show_separate_color") col.prop(st, "proxy_render_size") - col.prop(ed, "use_prefetch") + + if ed: + col.prop(ed, "use_prefetch") class SEQUENCER_PT_frame_overlay(SequencerButtonsPanel_Output, Panel): @@ -1981,6 +1983,12 @@ class SEQUENCER_PT_frame_overlay(SequencerButtonsPanel_Output, Panel): bl_category = "View" bl_options = {'DEFAULT_CLOSED'} + @classmethod + def poll(cls, context): + if not context.scene.sequence_editor: + return False + return SequencerButtonsPanel_Output.poll(context) + def draw_header(self, context): scene = context.scene ed = scene.sequence_editor diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 37a9c210832..181d4529ef1 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -6382,7 +6382,7 @@ static void rna_def_space_clip(BlenderRNA *brna) {0, NULL, 0, NULL, NULL}, }; - static const EnumPropertyItem gpencil_source_items[] = { + static const EnumPropertyItem annotation_source_items[] = { {SC_GPENCIL_SRC_CLIP, "CLIP", 0, @@ -6644,10 +6644,10 @@ static void rna_def_space_clip(BlenderRNA *brna) RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL); /* grease pencil source */ - prop = RNA_def_property(srna, "grease_pencil_source", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "annotation_source", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "gpencil_src"); - RNA_def_property_enum_items(prop, gpencil_source_items); - RNA_def_property_ui_text(prop, "Grease Pencil Source", "Where the grease pencil comes from"); + RNA_def_property_enum_items(prop, annotation_source_items); + RNA_def_property_ui_text(prop, "Annotation Source", "Where the annotation comes from"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_MOVIECLIP); RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL); |