Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-04 02:08:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-04 02:10:00 +0300
commitbc870f17a7fbcf52e86306932c97058ca8bb6f21 (patch)
tree4176ccf09924d000640ef415417f138a724bf24f /source/blender
parent771b9c8010d47e79a1f3cde9e25ecd5f275c3fa4 (diff)
Cleanup: style, shadow warning
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c3
-rw-r--r--source/blender/draw/engines/gpencil/gpencil_draw_utils.c4
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl2
-rw-r--r--source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl2
-rw-r--r--source/blender/editors/interface/interface_draw.c6
-rw-r--r--source/blender/gpu/intern/gpu_state.c2
-rw-r--r--source/blender/makesrna/intern/rna_scene.c2
7 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 56e91729d0e..7243cb5b522 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2244,7 +2244,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) {
if (mat->gp_style) {
if (((mat->gp_style->flag & GP_STYLE_STROKE_SHOW) == 0) &&
- ((mat->gp_style->flag & GP_STYLE_FILL_SHOW) == 0)) {
+ ((mat->gp_style->flag & GP_STYLE_FILL_SHOW) == 0))
+ {
mat->gp_style->flag |= GP_STYLE_STROKE_SHOW;
mat->gp_style->flag |= GP_STYLE_FILL_SHOW;
}
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index b12f6d2229b..abf1940ad4a 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -837,7 +837,7 @@ static void gpencil_draw_strokes(
if ((gps->totpoints > 2) && (!stl->storage->simplify_fill) &&
((gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (gp_style->fill_style > 0)) &&
((gps->flag & GP_STROKE_NOFILL) == 0) &&
- (gp_style->flag & GP_STYLE_FILL_SHOW))
+ (gp_style->flag & GP_STYLE_FILL_SHOW))
{
stl->shgroups[id].shgrps_fill = DRW_gpencil_shgroup_fill_create(
e_data, vedata, psl->stroke_pass, e_data->gpencil_fill_sh, gpd, gp_style, id);
@@ -985,7 +985,7 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data *e_data, void *vedata, T
(gpd->runtime.sfill[3] > GPENCIL_ALPHA_OPACITY_THRESH) &&
((gpd->runtime.sbuffer_sflag & GP_STROKE_NOFILL) == 0) &&
((brush->gpencil_settings->flag & GP_BRUSH_DISSABLE_LASSO) == 0) &&
- (gp_style->flag & GP_STYLE_FILL_SHOW))
+ (gp_style->flag & GP_STYLE_FILL_SHOW))
{
/* if not solid, fill is simulated with solid color */
if (gpd->runtime.bfill_style > 0) {
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl
index 439642f52e5..db973056110 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_point_frag.glsl
@@ -46,6 +46,6 @@ void main()
/* mult both alpha factor to use strength factor with color alpha limit */
fragColor.a = min(text_color.a * mColor.a, mColor.a);
}
- if(fragColor.a < 0.0035)
+ if(fragColor.a < 0.0035)
discard;
}
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
index 205b7a7fe64..9a82e871f56 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
@@ -44,6 +44,6 @@ void main()
fragColor.a = min(text_color.a * tColor.a, tColor.a);
}
- if(fragColor.a < 0.0035)
+ if(fragColor.a < 0.0035)
discard;
}
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index d696dbd0d88..68058292c44 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1795,7 +1795,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
/* curve */
for (int a = 0; a <= CM_TABLE; a++) {
fx = rect->xmin + zoomx * (cmp[a].x - offsx);
- fy = rect->ymin + zoomy * (cmp[a].y - offsy);
+ fy = rect->ymin + zoomy * (cmp[a].y - offsy);
immVertex2f(pos, fx, rect->ymin);
immVertex2f(pos, fx, fy);
}
@@ -1831,8 +1831,8 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
UI_GetThemeColor4fv(TH_TEXT_HI, color);
else
UI_GetThemeColor4fv(TH_TEXT, color);
- float fx = rect->xmin + zoomx * (cmp[a].x - offsx);
- float fy = rect->ymin + zoomy * (cmp[a].y - offsy);
+ fx = rect->xmin + zoomx * (cmp[a].x - offsx);
+ fy = rect->ymin + zoomy * (cmp[a].y - offsy);
immAttr4fv(col, color);
immVertex2f(pos, fx, fy);
}
diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c
index afc8570356b..d06854f669f 100644
--- a/source/blender/gpu/intern/gpu_state.c
+++ b/source/blender/gpu/intern/gpu_state.c
@@ -176,4 +176,4 @@ void GPU_flush(void)
void GPU_finish(void)
{
glFinish();
-} \ No newline at end of file
+}
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index e5efdbc2054..b57156bcc97 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2235,7 +2235,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
{GP_PROJECT_DEPTH_STROKE_FIRST, "FIRST", 0, "First point", "Snap to first point" },
{0, NULL, 0, NULL, NULL}
};
-
+
static const EnumPropertyItem gpencil_selectmode_items[] = {
{GP_SELECTMODE_POINT, "POINT", ICON_GP_SELECT_POINTS, "Point", "Select only points"},
{GP_SELECTMODE_STROKE, "STROKE", ICON_GP_SELECT_STROKES, "Stroke", "Select all stroke points" },