[Bf-blender-cvs] [d068c6017c6] master: 3D View: use full opacity by default

[Campbell Barton]

Commit: d068c6017c6ee840a395b37b68b7d42cb5095dda
Author: Campbell Barton
Date:   Fri Jan 4 08:21:07 2019 +1100
Branches: master
https://developer.blender.org/rBd068c6017c6ee840a395b37b68b7d42cb5095dda

3D View: use full opacity by default

Vertex paint overlays the color w/ solid mode,
Having a partial overlay makes the sample tool not give useful results.

===================================================================

M	source/blender/blenloader/intern/versioning_280.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 85dfbdd1fec..d8ed41c4d55 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -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;
 						}
 					}
 				}
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index c7f82539e68..2685fb4810d 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -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 |
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 3bddb46d644..8bdf947449e 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -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);