archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

3D View: use full opacity by default

Browse Source 
Vertex paint overlays the color w/ solid mode,
Having a partial overlay makes the sample tool not give useful results.
This commit is contained in:
Campbell Barton
2019-01-04 08:21:07 +11:00
parent 5958dd4098
commit d068c6017c
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenloader/intern/versioning_280.c
View File

@@ -1769,11 +1769,10 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (sl->spacetype == SPACE_VIEW3D) {
enum { V3D_SHOW_MODE_SHADE_OVERRIDE = (1 << 15), };
View3D *v3d = (View3D *)sl;
float alpha = v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE ? 0.0f : 0.8f;
float alpha_full = v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE ? 0.0f : 1.0f;
float alpha = v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE ? 0.0f : 1.0f;
v3d->overlay.texture_paint_mode_opacity = alpha;
v3d->overlay.vertex_paint_mode_opacity = alpha;
v3d->overlay.weight_paint_mode_opacity = alpha_full;
v3d->overlay.weight_paint_mode_opacity = alpha;
}
}
}

4
source/blender/editors/space_view3d/space_view3d.c
View File

@@ -326,9 +326,9 @@ static SpaceLink *view3d_new(const ScrArea *UNUSED(sa), const Scene *scene)
v3d->overlay.wireframe_threshold = 1.0f;
v3d->overlay.xray_alpha_bone = 0.5f;
v3d->overlay.texture_paint_mode_opacity = 0.8;
v3d->overlay.texture_paint_mode_opacity = 1.0f;
v3d->overlay.weight_paint_mode_opacity = 1.0f;
v3d->overlay.vertex_paint_mode_opacity = 0.8;
v3d->overlay.vertex_paint_mode_opacity = 1.0f;
v3d->overlay.edit_flag = V3D_OVERLAY_EDIT_FACES |
V3D_OVERLAY_EDIT_SEAMS |
V3D_OVERLAY_EDIT_SHARP |

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

@@ -2953,14 +2953,14 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna)
prop = RNA_def_property(srna, "texture_paint_mode_opacity", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "overlay.texture_paint_mode_opacity");
RNA_def_property_float_default(prop, 0.8f);
RNA_def_property_float_default(prop, 1.0f);
RNA_def_property_ui_text(prop, "Texture Opacity", "Opacity of the texture paint mode overlay");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "vertex_paint_mode_opacity", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "overlay.vertex_paint_mode_opacity");
RNA_def_property_float_default(prop, 0.8f);
RNA_def_property_float_default(prop, 1.0f);
RNA_def_property_ui_text(prop, "Vertex Paint Opacity", "Opacity of the vertex paint mode overlay");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);