blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 765 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Philipp Oeser 2020-05-19 15:18:39 +02:00
parent eb1cb7cb81 8c4965f86d
commit cc485191e4
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/uvedit/uvedit_draw.c
View File

@ -223,7 +223,6 @@ static void draw_uvs_shadow(SpaceImage *sima,
{
Object *ob_eval = DEG_get_evaluated_object(depsgraph, obedit);
Mesh *me = ob_eval->data;
const float overlay_alpha = sima->uv_opacity;
float col[4];
UI_GetThemeColor4fv(TH_UV_SHADOW, col);
@ -236,11 +235,7 @@ static void draw_uvs_shadow(SpaceImage *sima,
GPU_line_smooth(true);
GPU_blend(true);
}
else if (overlay_alpha < 1.0f) {
GPU_blend(true);
}
col[3] = overlay_alpha;
GPU_batch_program_set_builtin(edges, GPU_SHADER_2D_UV_UNIFORM_COLOR);
GPU_batch_uniform_4fv(edges, "color", col);
GPU_batch_draw(edges);
@ -249,9 +244,6 @@ static void draw_uvs_shadow(SpaceImage *sima,
GPU_line_smooth(false);
GPU_blend(false);
}
else if (overlay_alpha < 1.0f) {
GPU_blend(false);
}
}
}

2
source/blender/makesrna/intern/rna_fluid.c
View File

@ -1725,7 +1725,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna)
"resolution of the domain). For best meshing, it is recommended to "
"adjust the mesh particle radius alongside this value");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_domain_reset");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_meshcache_reset");
prop = RNA_def_property(srna, "mesh_generator", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "mesh_generator");