Amendment to previous commit: Add an option to scene strips to disable GPencil
On second thought, it is probably still worthwhile to be able to disable GPencil drawing on strips. By default, GPencil strokes are still shown by default now, but they can be turned off using this option if it turns out that they are getting in the way (e.g. a director/animator make some planning notes in the shot at an earlier stage which are hidden for normal display now, but are still there popping up sproadically during the animatic).
This commit is contained in:
parent
3673a03226
commit
e54d571176
@ -793,6 +793,8 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel):
|
||||
layout.label(text="Camera Override")
|
||||
layout.template_ID(strip, "scene_camera")
|
||||
|
||||
layout.prop(strip, "use_grease_pencil", text="Show Grease Pencil")
|
||||
|
||||
if scene:
|
||||
layout.prop(scene, "audio_volume", text="Audio Volume")
|
||||
|
||||
|
@ -2529,6 +2529,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
|
||||
int do_seq;
|
||||
// bool have_seq = false; /* UNUSED */
|
||||
bool have_comp = false;
|
||||
bool use_gpencil = true;
|
||||
Scene *scene;
|
||||
int is_thread_main = BLI_thread_is_main();
|
||||
|
||||
@ -2554,6 +2555,10 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
|
||||
camera = scene->camera;
|
||||
}
|
||||
|
||||
if (seq->flag & SEQ_SCENE_NO_GPENCIL) {
|
||||
use_gpencil = false;
|
||||
}
|
||||
|
||||
if (have_comp == false && camera == NULL) {
|
||||
scene->r.cfra = oldcfra;
|
||||
return NULL;
|
||||
@ -2586,7 +2591,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
|
||||
ibuf = sequencer_view3d_cb(scene, camera, width, height, IB_rect,
|
||||
context->scene->r.seq_prev_type,
|
||||
(context->scene->r.seq_flag & R_SEQ_SOLID_TEX) != 0,
|
||||
true, true, scene->r.alphamode, err_out);
|
||||
use_gpencil, true, scene->r.alphamode, err_out);
|
||||
if (ibuf == NULL) {
|
||||
fprintf(stderr, "seq_render_scene_strip failed to get opengl buffer: %s\n", err_out);
|
||||
}
|
||||
|
@ -364,6 +364,9 @@ enum {
|
||||
SEQ_AUDIO_PAN_ANIMATED = (1 << 26),
|
||||
SEQ_AUDIO_DRAW_WAVEFORM = (1 << 27),
|
||||
|
||||
/* don't include Grease Pencil in OpenGL previews of Scene strips */
|
||||
SEQ_SCENE_NO_GPENCIL = (1 << 28),
|
||||
|
||||
SEQ_INVALID_EFFECT = (1 << 31),
|
||||
};
|
||||
|
||||
|
@ -1847,6 +1847,11 @@ static void rna_def_scene(BlenderRNA *brna)
|
||||
RNA_def_property_ui_text(prop, "Camera Override", "Override the scenes active camera");
|
||||
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
|
||||
|
||||
prop = RNA_def_property(srna, "use_grease_pencil", PROP_BOOLEAN, PROP_NONE);
|
||||
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SEQ_SCENE_NO_GPENCIL);
|
||||
RNA_def_property_ui_text(prop, "Use Grease Pencil", "Show Grease Pencil strokes in OpenGL previews");
|
||||
RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update");
|
||||
|
||||
rna_def_filter_video(srna);
|
||||
rna_def_proxy(srna);
|
||||
rna_def_input(srna);
|
||||
|
Loading…
Reference in New Issue
Block a user