forked from bartvdbraak/blender
Added the old Edge settings to scene properties. This old feature is really quite terrible as it isn't even resolution independent - the edge width should be relative to the image dimensions.
Adjusted layout for sound in sequencer and a few other minor tweaks.
This commit is contained in:
parent
a44b948260
commit
9965e8915d
@ -191,18 +191,26 @@ class SCENE_PT_post_processing(RenderButtonsPanel):
|
||||
col.itemR(rd, "use_sequencer")
|
||||
|
||||
col = split.column()
|
||||
row = col.row()
|
||||
row.itemR(rd, "fields", text="Fields")
|
||||
sub = row.row()
|
||||
sub.active = rd.fields
|
||||
sub.itemR(rd, "fields_still", text="Still")
|
||||
sub = col.row()
|
||||
sub.active = rd.fields
|
||||
sub.itemR(rd, "field_order", expand=True)
|
||||
col.itemR(rd, "dither_intensity", text="Dither", slider=True)
|
||||
|
||||
layout.itemS()
|
||||
|
||||
split = layout.split()
|
||||
split.itemL()
|
||||
split.itemR(rd, "dither_intensity", text="Dither", slider=True)
|
||||
|
||||
col = split.column()
|
||||
col.itemR(rd, "fields", text="Fields")
|
||||
sub = col.column()
|
||||
sub.active = rd.fields
|
||||
sub.row().itemR(rd, "field_order", expand=True)
|
||||
sub.itemR(rd, "fields_still", text="Still")
|
||||
|
||||
col = split.column()
|
||||
|
||||
col.itemR(rd, "edge")
|
||||
sub = col.column()
|
||||
sub.active = rd.edge
|
||||
sub.itemR(rd, "edge_threshold", text="Threshold", slider=True)
|
||||
sub.itemR(rd, "edge_color", text="")
|
||||
|
||||
class SCENE_PT_output(RenderButtonsPanel):
|
||||
__label__ = "Output"
|
||||
|
@ -303,6 +303,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel):
|
||||
row.itemR(strip, "frame_locked", text="Frame Lock")
|
||||
|
||||
col = layout.column()
|
||||
col.enabled = not strip.lock
|
||||
col.itemR(strip, "channel")
|
||||
col.itemR(strip, "start_frame")
|
||||
col.itemR(strip, "length")
|
||||
@ -422,16 +423,21 @@ class SEQUENCER_PT_input(SequencerButtonsPanel):
|
||||
|
||||
strip = act_strip(context)
|
||||
|
||||
layout.itemR(strip, "directory", text="")
|
||||
split = layout.split(percentage=0.2)
|
||||
col = split.column()
|
||||
col.itemL(text="Path:")
|
||||
col = split.column()
|
||||
col.itemR(strip, "directory", text="")
|
||||
|
||||
# Current element for the filename
|
||||
split = layout.split(percentage=0.3)
|
||||
col = split.column()
|
||||
col.itemL(text="File Name:")
|
||||
col = split.column()
|
||||
|
||||
|
||||
elem = strip.getStripElem(context.scene.current_frame)
|
||||
if elem:
|
||||
split = layout.split(percentage=0.2)
|
||||
col = split.column()
|
||||
col.itemL(text="File:")
|
||||
col = split.column()
|
||||
col.itemR(elem, "filename", text="") # strip.elements[0] could be a fallback
|
||||
|
||||
if strip.type != 'SOUND':
|
||||
@ -477,14 +483,15 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel):
|
||||
layout.template_ID(strip, "sound", new="sound.open")
|
||||
|
||||
layout.itemS()
|
||||
layout.itemR(strip.sound, "filename", text="")
|
||||
|
||||
row = layout.row()
|
||||
if strip.sound.packed_file:
|
||||
layout.itemO("sound.unpack")
|
||||
row.itemO("sound.unpack", icon='ICON_PACKAGE', text="Unpack")
|
||||
else:
|
||||
layout.itemO("sound.pack")
|
||||
row.itemO("sound.pack", icon='ICON_UGLYPACKAGE', text="Pack")
|
||||
|
||||
layout.itemR(strip.sound, "filename")
|
||||
layout.itemR(strip.sound, "caching")
|
||||
row.itemR(strip.sound, "caching")
|
||||
|
||||
class SEQUENCER_PT_filter(SequencerButtonsPanel):
|
||||
__label__ = "Filter"
|
||||
|
@ -1621,10 +1621,10 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Edge", "Create a toon outline around the edges of geometry");
|
||||
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
|
||||
|
||||
prop= RNA_def_property(srna, "edge_intensity", PROP_INT, PROP_NONE);
|
||||
prop= RNA_def_property(srna, "edge_threshold", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_int_sdna(prop, NULL, "edgeint");
|
||||
RNA_def_property_range(prop, 0, 255);
|
||||
RNA_def_property_ui_text(prop, "Edge Intensity", "Threshold for drawing outlines on geometry edges");
|
||||
RNA_def_property_ui_text(prop, "Edge Threshold", "Threshold for drawing outlines on geometry edges");
|
||||
RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
|
||||
|
||||
prop= RNA_def_property(srna, "edge_color", PROP_FLOAT, PROP_COLOR);
|
||||
|
Loading…
Reference in New Issue
Block a user