griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Aras Pranckevicius
2024-03-15 16:55:41 +02:00
parent 444bc3154a 52a8bea237
commit ce5f864027
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/object/object_edit.cc
View File

@@ -1613,6 +1613,7 @@ static int shade_smooth_exec(bContext *C, wmOperator *op)
const float angle = RNA_float_get(op->ptr, "angle");
bke::mesh_sharp_edges_set_from_angle(mesh, angle, keep_sharp_edges);
}
mesh.tag_sharpness_changed();
BKE_mesh_batch_cache_dirty_tag(static_cast<Mesh *>(ob->data), BKE_MESH_BATCH_DIRTY_ALL);
changed = true;
}

26
source/blender/editors/space_sequencer/sequencer_preview_draw.cc
View File

@@ -529,10 +529,6 @@ static void draw_histogram(ARegion *region,
return;
}
/* Background. */
uchar col_bg[4] = {0, 0, 0, 255};
quads.add_quad(area.xmin, area.ymin, area.xmax, area.ymax, col_bg);
/* Grid lines and labels. */
uchar col_grid[4] = {128, 128, 128, 128};
float grid_x_0 = area.xmin;
@@ -814,8 +810,25 @@ static void sequencer_draw_scopes(Scene *scene, ARegion *region, SpaceSeq *sseq)
SeqQuadsBatch quads;
SeqScopes *scopes = &sseq->runtime->scopes;
/* Draw scope image if there is one. */
bool use_blend = sseq->mainb == SEQ_DRAW_IMG_IMBUF && sseq->flag & SEQ_USE_ALPHA;
/* Draw opaque black rectangle over whole preview area. The scope texture
* with clamp to border extend mode should be enough, but results in
* garbage pixels around the actual scope on some GPUs/drivers (#119505).
* To fix that, background must be drawn, and then the scopes texture be
* blended on top. */
if (sseq->mainb != SEQ_DRAW_IMG_IMBUF) {
GPU_blend(GPU_BLEND_NONE);
uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
uchar black[4] = {0, 0, 0, 255};
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
immUniformColor4ubv(black);
immRectf(pos, preview.xmin, preview.ymin, preview.xmax, preview.ymax);
immUnbindProgram();
use_blend = true;
}
/* Draw scope image if there is one. */
ImBuf *scope_image = nullptr;
if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
scope_image = scopes->zebra_ibuf;
@@ -827,9 +840,6 @@ static void sequencer_draw_scopes(Scene *scene, ARegion *region, SpaceSeq *sseq)
else if (sseq->mainb == SEQ_DRAW_IMG_VECTORSCOPE) {
scope_image = scopes->vector_ibuf;
}
else if (sseq->mainb == SEQ_DRAW_IMG_HISTOGRAM) {
use_blend = true;
}
if (use_blend) {
GPU_blend(GPU_BLEND_ALPHA);