blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Rename eSpaceSeq_Proxy_RenderSize members 

Remove word proxy from eSpaceSeq_Proxy_RenderSize members if proxy is
not used with that item. Otherwise this can be a bit confusing.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D8861
This commit is contained in:
Richard Antalik 2020-10-05 02:24:51 +02:00
parent f375ec4986
commit d12ff69320
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/seqeffects.c
View File

@ -3901,7 +3901,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context,
/* Compensate text size for preview render size. */
proxy_size_comp = context->scene->r.size / 100.0;
if (context->preview_render_size != SEQ_PROXY_RENDER_SIZE_SCENE) {
if (context->preview_render_size != SEQ_RENDER_SIZE_SCENE) {
proxy_size_comp *= BKE_sequencer_rendersize_to_scale_factor(context->preview_render_size);
}

16
source/blender/blenkernel/intern/sequencer.c
View File

@ -1631,13 +1631,13 @@ typedef struct SeqIndexBuildContext {
static IMB_Proxy_Size seq_rendersize_to_proxysize(int render_size)
{
switch (render_size) {
case SEQ_PROXY_RENDER_SIZE_25:
case SEQ_RENDER_SIZE_PROXY_25:
return IMB_PROXY_25;
case SEQ_PROXY_RENDER_SIZE_50:
case SEQ_RENDER_SIZE_PROXY_50:
return IMB_PROXY_50;
case SEQ_PROXY_RENDER_SIZE_75:
case SEQ_RENDER_SIZE_PROXY_75:
return IMB_PROXY_75;
case SEQ_PROXY_RENDER_SIZE_100:
case SEQ_RENDER_SIZE_PROXY_100:
return IMB_PROXY_100;
}
return IMB_PROXY_NONE;
@ -1646,11 +1646,11 @@ static IMB_Proxy_Size seq_rendersize_to_proxysize(int render_size)
double BKE_sequencer_rendersize_to_scale_factor(int render_size)
{
switch (render_size) {
case SEQ_PROXY_RENDER_SIZE_25:
case SEQ_RENDER_SIZE_PROXY_25:
return 0.25;
case SEQ_PROXY_RENDER_SIZE_50:
case SEQ_RENDER_SIZE_PROXY_50:
return 0.50;
case SEQ_PROXY_RENDER_SIZE_75:
case SEQ_RENDER_SIZE_PROXY_75:
return 0.75;
}
return 1.0;
@ -2714,7 +2714,7 @@ static ImBuf *input_preprocess(const SeqRenderData *context,
/* Calculate scale factor for current image if needed. */
double scale_factor, image_scale_factor = 1.0;
if (context->preview_render_size == SEQ_PROXY_RENDER_SIZE_SCENE) {
if (context->preview_render_size == SEQ_RENDER_SIZE_SCENE) {
scale_factor = image_scale_factor = (double)scene->r.size / 100;
}
else {

6
source/blender/editors/space_sequencer/sequencer_draw.c
View File

@ -1250,11 +1250,11 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain,
double render_size;
short is_break = G.is_break;
if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) {
if (sseq->render_size == SEQ_RENDER_SIZE_NONE) {
return NULL;
}
if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_SCENE) {
if (sseq->render_size == SEQ_RENDER_SIZE_SCENE) {
render_size = scene->r.size / 100.0;
}
else {
@ -1795,7 +1795,7 @@ void sequencer_draw_preview(const bContext *C,
GPU_framebuffer_bind_no_srgb(framebuffer_overlay);
GPU_depth_test(GPU_DEPTH_NONE);
if (sseq->render_size == SEQ_PROXY_RENDER_SIZE_NONE) {
if (sseq->render_size == SEQ_RENDER_SIZE_NONE) {
sequencer_preview_clear();
return;
}

14
source/blender/makesdna/DNA_space_types.h
View File

@ -635,13 +635,13 @@ typedef enum eSpaceSeq_Displays {
/* SpaceSeq.render_size */
typedef enum eSpaceSeq_Proxy_RenderSize {
SEQ_PROXY_RENDER_SIZE_NONE = -1,
SEQ_PROXY_RENDER_SIZE_SCENE = 0,
SEQ_PROXY_RENDER_SIZE_25 = 25,
SEQ_PROXY_RENDER_SIZE_50 = 50,
SEQ_PROXY_RENDER_SIZE_75 = 75,
SEQ_PROXY_RENDER_SIZE_100 = 99,
SEQ_PROXY_RENDER_SIZE_FULL = 100,
SEQ_RENDER_SIZE_NONE = -1,
SEQ_RENDER_SIZE_SCENE = 0,
SEQ_RENDER_SIZE_PROXY_25 = 25,
SEQ_RENDER_SIZE_PROXY_50 = 50,
SEQ_RENDER_SIZE_PROXY_75 = 75,
SEQ_RENDER_SIZE_PROXY_100 = 99,
SEQ_RENDER_SIZE_FULL = 100,
} eSpaceSeq_Proxy_RenderSize;
typedef struct MaskSpaceInfo {

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

@ -4703,13 +4703,13 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
};
static const EnumPropertyItem proxy_render_size_items[] = {
{SEQ_PROXY_RENDER_SIZE_NONE, "NONE", 0, "No display", ""},
{SEQ_PROXY_RENDER_SIZE_SCENE, "SCENE", 0, "Scene render size", ""},
{SEQ_PROXY_RENDER_SIZE_25, "PROXY_25", 0, "Proxy size 25%", ""},
{SEQ_PROXY_RENDER_SIZE_50, "PROXY_50", 0, "Proxy size 50%", ""},
{SEQ_PROXY_RENDER_SIZE_75, "PROXY_75", 0, "Proxy size 75%", ""},
{SEQ_PROXY_RENDER_SIZE_100, "PROXY_100", 0, "Proxy size 100%", ""},
{SEQ_PROXY_RENDER_SIZE_FULL, "FULL", 0, "No proxy, full render", ""},
{SEQ_RENDER_SIZE_NONE, "NONE", 0, "No display", ""},
{SEQ_RENDER_SIZE_SCENE, "SCENE", 0, "Scene render size", ""},
{SEQ_RENDER_SIZE_PROXY_25, "PROXY_25", 0, "Proxy size 25%", ""},
{SEQ_RENDER_SIZE_PROXY_50, "PROXY_50", 0, "Proxy size 50%", ""},
{SEQ_RENDER_SIZE_PROXY_75, "PROXY_75", 0, "Proxy size 75%", ""},
{SEQ_RENDER_SIZE_PROXY_100, "PROXY_100", 0, "Proxy size 100%", ""},
{SEQ_RENDER_SIZE_FULL, "FULL", 0, "No proxy, full render", ""},
{0, NULL, 0, NULL, NULL},
};

2
source/blender/render/intern/source/pipeline.c
View File

@ -1508,7 +1508,7 @@ static void do_render_seq(Render *re)
re->scene,
re_x,
re_y,
SEQ_PROXY_RENDER_SIZE_SCENE,
SEQ_RENDER_SIZE_SCENE,
true,
&context);