[Bf-blender-cvs] [1739e1d6eb7] greasepencil-object: Change default edit line color
Antonio Vazquez
noreply at git.blender.org
Tue Dec 5 11:10:08 CET 2017
Commit: 1739e1d6eb7003cc173ed3fab540f47ee328d5bc
Author: Antonio Vazquez
Date: Tue Dec 5 11:09:35 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB1739e1d6eb7003cc173ed3fab540f47ee328d5bc
Change default edit line color
The alpha was too low
===================================================================
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 164f0d405f2..ec04c250ec5 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -729,7 +729,7 @@ bGPdata *BKE_gpencil_data_addnew(Main *bmain, const char name[])
/* GP object specific settings */
gpd->flag |= GP_DATA_STROKE_SHOW_EDIT_LINES;
- ARRAY_SET_ITEMS(gpd->line_color, 0.6f, 0.6f, 0.6f, 0.3f);
+ ARRAY_SET_ITEMS(gpd->line_color, 0.6f, 0.6f, 0.6f, 0.5f);
gpd->xray_mode = GP_XRAY_3DSPACE;
gpd->batch_cache_data = NULL;
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index e9f20c1b5fa..0f90388d37f 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1008,7 +1008,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
/* Init grease pencil edit line color */
if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "line_color[4]")) {
for (bGPdata *gpd = main->gpencil.first; gpd; gpd = gpd->id.next) {
- ARRAY_SET_ITEMS(gpd->line_color, 0.6f, 0.6f, 0.6f, 0.3f);
+ ARRAY_SET_ITEMS(gpd->line_color, 0.6f, 0.6f, 0.6f, 0.5f);
}
}
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 40ace500db2..8d6e093dae7 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1381,7 +1381,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
PropertyRNA *prop;
FunctionRNA *func;
- static float default_1[4] = { 0.6f, 0.6f, 0.6f, 0.3f };
+ static float default_1[4] = { 0.6f, 0.6f, 0.6f, 0.5f };
static float onion_dft1[3] = { 0.145098f, 0.419608f, 0.137255f }; /* green */
static float onion_dft2[3] = { 0.125490f, 0.082353f, 0.529412f }; /* blue */
More information about the Bf-blender-cvs
mailing list