blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Antonio Vazquez 2020-05-07 12:17:00 +02:00
parent ebd7e87f33 3fed85f9d2
commit 45a77ba09d
Notes: blender-bot 2023-02-14 07:30:31 +01:00 
Referenced by issue #76479, MantaFlow Smoke simulation "breaks" after 110 frames
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -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")

10
release/scripts/startup/bl_ui/space_sequencer.py
View File

@ -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

8
source/blender/makesrna/intern/rna_space.c
View File

@ -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);