Commit: b40df071d8ad9ff8ac572991262dfb375cc361eb
Author: Antonio Vazquez
Date: Thu Jun 7 09:10:45 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb40df071d8ad9ff8ac572991262dfb375cc361eb
Remove Onion Skinning override by Layer
This option is not required and only add complexity.
The UI panel was removed in a previous commit.
===================================================================
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 0101994fb02..0e058c875d7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -954,26 +954,15 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data
*e_data, void *vedata, T
/* get alpha factor for onion strokes */
static void gpencil_get_onion_alpha(float color[4], bGPdata *gpd, bGPDlayer
*gpl)
{
- #define MIN_ALPHA_VALUE 0.01f
+#define MIN_ALPHA_VALUE 0.01f
/* if fade is disabled, opacity is equal in all frames */
- if (gpl->onion_flag & GP_LAYER_ONION_OVERRIDE) {
- if ((gpl->onion_flag & GP_ONION_FADE) == 0) {
- color[3] = gpl->onion_factor;
- }
- else {
- /* add override opacity factor */
- color[3] += gpl->onion_factor - 0.5f;
- }
+ if ((gpd->onion_flag & GP_ONION_FADE) == 0) {
+ color[3] = gpd->onion_factor;
}
else {
- if ((gpd->onion_flag & GP_ONION_FADE) == 0) {
- color[3] = gpd->onion_factor;
- }
- else {
- /* add override opacity factor */
- color[3] += gpd->onion_factor - 0.5f;
- }
+ /* add override opacity factor */
+ color[3] += gpd->onion_factor - 0.5f;
}
CLAMP(color[3], MIN_ALPHA_VALUE, 1.0f);
@@ -981,8 +970,8 @@ static void gpencil_get_onion_alpha(float color[4], bGPdata
*gpd, bGPDlayer *gpl
/* draw onion-skinning for a layer */
static void gpencil_draw_onionskins(
- GpencilBatchCache *cache, GPENCIL_e_data *e_data, void *vedata,
- Object *ob, bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf)
+ GpencilBatchCache *cache, GPENCIL_e_data *e_data, void *vedata,
+ Object *ob, bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf)
{
const float default_color[3] = { UNPACK3(U.gpencil_new_layer_col) };
@@ -996,39 +985,20 @@ static void gpencil_draw_onionskins(
bGPDframe *gpf_loop = NULL;
int last = gpf->framenum;
- if (gpl->onion_flag & GP_LAYER_ONION_OVERRIDE) {
- if (gpl->onion_flag & GP_LAYER_GHOST_PREVCOL) {
- colflag = true;
- }
- }
- else {
- colflag = (bool)gpd->onion_flag & GP_ONION_GHOST_PREVCOL;
- }
+ colflag = (bool)gpd->onion_flag & GP_ONION_GHOST_PREVCOL;
+
/* -------------------------------
* 1) Draw Previous Frames First
* ------------------------------- */
- if (gpl->onion_flag & GP_LAYER_ONION_OVERRIDE) {
- step = gpl->gstep;
- mode = gpl->onion_mode;
+ step = gpd->gstep;
+ mode = gpd->onion_mode;
- if (gpl->onion_flag & GP_LAYER_GHOST_PREVCOL) {
- copy_v3_v3(color, gpl->gcolor_prev);
- }
- else {
- copy_v3_v3(color, default_color);
- }
+ if (gpd->onion_flag & GP_ONION_GHOST_PREVCOL) {
+ copy_v3_v3(color, gpd->gcolor_prev);
}
else {
- step = gpd->gstep;
- mode = gpd->onion_mode;
-
- if (gpd->onion_flag & GP_ONION_GHOST_PREVCOL) {
- copy_v3_v3(color, gpd->gcolor_prev);
- }
- else {
- copy_v3_v3(color, default_color);
- }
+ copy_v3_v3(color, default_color);
}
idx = 0;
@@ -1078,27 +1048,14 @@ static void gpencil_draw_onionskins(
/* -------------------------------
* 2) Now draw next frames
* ------------------------------- */
- if (gpl->onion_flag & GP_LAYER_ONION_OVERRIDE) {
- step = gpl->gstep_next;
- mode = gpl->onion_mode;
+ step = gpd->gstep_next;
+ mode = gpd->onion_mode;
- if (gpl->onion_flag & GP_LAYER_GHOST_NEXTCOL) {
- copy_v3_v3(color, gpl->gcolor_next);
- }
- else {
- copy_v3_v3(color, default_color);
- }
+ if (gpd->onion_flag & GP_ONION_GHOST_NEXTCOL) {
+ copy_v3_v3(color, gpd->gcolor_next);
}
else {
- step = gpd->gstep_next;
- mode = gpd->onion_mode;
-
- if (gpd->onion_flag & GP_ONION_GHOST_NEXTCOL) {
- copy_v3_v3(color, gpd->gcolor_next);
- }
- else {
- copy_v3_v3(color, default_color);
- }
+ copy_v3_v3(color, default_color);
}
idx = 0;
@@ -1149,8 +1106,8 @@ static void gpencil_draw_onionskins(
if ((last == gpf->framenum) || (gpf->next == NULL)) {
gpencil_get_onion_alpha(color, gpd, gpl);
gpencil_draw_onion_strokes(
- cache, e_data, vedata, ob, gpd, gpl,
- gpf_loop, color[3], color, colflag);
+ cache, e_data, vedata, ob, gpd, gpl,
+ gpf_loop, color[3], color, colflag);
}
}
}
diff --git a/source/blender/makesdna/DNA_gpencil_types.h
b/source/blender/makesdna/DNA_gpencil_types.h
index bb1d872bbfc..5999b112579 100644
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@ -306,9 +306,6 @@ typedef enum eGPDlayer_OnionFlag {
GP_LAYER_GHOST_ALWAYS = (1 << 3),
/* use fade color in onion skin */
GP_LAYER_ONION_FADE = (1 << 4),
-
- /* override datablock onion skinning settings */
- GP_LAYER_ONION_OVERRIDE = (1 << 15),
} eGPDlayer_OnionFlag;
/* ***************************************** */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c
b/source/blender/makesrna/intern/rna_gpencil.c
index e8bbc4e7fcb..7c4cc9c2bc8 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1211,12 +1211,6 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
"Display onion keyframes with a fade in color transparency");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
- prop = RNA_def_property(srna, "override_onion", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "onion_flag",
GP_LAYER_ONION_OVERRIDE);
- RNA_def_property_ui_text(prop, "Override",
- "Override onion settings with layer settings");
- RNA_def_property_update(prop, NC_GPENCIL | ND_DATA,
"rna_GPencil_update");
-
prop = RNA_def_property(srna, "onion_factor", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "onion_factor");
RNA_def_property_float_default(prop, 0.5f);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
