Commit: 3e311fdcd17602ca74a332fda24ee43f89e7ecd2
Author: Campbell Barton
Date: Sun Dec 16 09:29:04 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB3e311fdcd17602ca74a332fda24ee43f89e7ecd2
Cleanup: style
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
M source/blender/draw/intern/draw_cache_impl_curve.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index aa6adee0d19..1dba7b814d2 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1076,7 +1076,6 @@ class _defs_gpencil_paint:
widget=None,
keymap=(),
)
-
@ToolDef.from_fn
def curve():
@@ -1086,7 +1085,7 @@ class _defs_gpencil_paint:
cursor='CROSSHAIR',
widget=None,
keymap=(),
- )
+ )
class _defs_gpencil_edit:
@ToolDef.from_fn
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 3b1c51cb8eb..78cf5558740 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1229,10 +1229,10 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data
*e_data, void *vedata, T
}
if ((gpd->runtime.sbuffer_size >= 3) &&
- (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))
+ (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))
{
/* if not solid, fill is simulated with
solid color */
if (gpd->runtime.bfill_style > 0) {
@@ -1262,9 +1262,9 @@ void DRW_gpencil_populate_buffer_strokes(GPENCIL_e_data
*e_data, void *vedata, T
/* control points */
if ((overlay) && (gpd->runtime.tot_cp_points > 0) &&
- ((gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0) &&
- ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) &&
- ((v3d->gizmo_flag & V3D_GIZMO_HIDE_TOOL) == 0))
+ ((gpd->runtime.sbuffer_sflag & GP_STROKE_ERASER) == 0) &&
+ ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) &&
+ ((v3d->gizmo_flag & V3D_GIZMO_HIDE_TOOL) == 0))
{
DRWShadingGroup *shgrp = DRW_shgroup_create(
diff --git
a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
index 3b99018cedd..748f69ab21a 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_geom.glsl
@@ -57,7 +57,7 @@ bool is_equal(vec4 p1, vec4 p2)
if ((x < limit) && (y < limit) && (z < limit)) {
return true;
}
-
+
return false;
}
diff --git a/source/blender/draw/intern/draw_cache_impl_curve.c
b/source/blender/draw/intern/draw_cache_impl_curve.c
index 06aafb547f9..f469ece6f18 100644
--- a/source/blender/draw/intern/draw_cache_impl_curve.c
+++ b/source/blender/draw/intern/draw_cache_impl_curve.c
@@ -990,7 +990,7 @@ void DRW_curve_batch_cache_create_requested(Object *ob)
}
if (DRW_vbo_requested(cache->tess.pos_nor) ||
- DRW_vbo_requested(cache->tess.uv))
+ DRW_vbo_requested(cache->tess.uv))
{
DRW_displist_vertbuf_create_pos_and_nor_and_uv_tess(lb,
cache->tess.pos_nor, cache->tess.uv);
}
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index 6d8f337bfc2..c163ce40a6c 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1021,7 +1021,7 @@ static void gp_stroke_newfrombuffer(tGPsdata *p)
depth_arr = MEM_mallocN(sizeof(float) *
gpd->runtime.sbuffer_size, "depth_points");
for (i = 0, ptc = gpd->runtime.sbuffer; i <
gpd->runtime.sbuffer_size; i++, ptc++, pt++) {
-
+
round_v2i_v2fl(mval_i, &ptc->x);
if ((ED_view3d_autodist_depth(p->ar, mval_i,
depth_margin, depth_arr + i) == 0) &&
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c
b/source/blender/editors/gpencil/gpencil_primitive.c
index f067ff167fc..5cc06946544 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -284,7 +284,8 @@ static bool gpencil_primitive_add_poll(bContext *C)
}
/* Allocate memory to stroke, adds MAX_EDGES on every call */
-static void gpencil_primitive_allocate_memory(tGPDprimitive *tgpi) {
+static void gpencil_primitive_allocate_memory(tGPDprimitive *tgpi)
+{
tgpi->point_count += (tgpi->type == GP_STROKE_BOX) ? (MAX_EDGES * 4 +
1) : (MAX_EDGES + 1);
bGPDstroke *gpsf = tgpi->gpf->strokes.first;
gpsf->points = MEM_reallocN(gpsf->points, sizeof(bGPDspoint) *
tgpi->point_count);
@@ -332,8 +333,9 @@ static void gp_primitive_set_initdata(bContext *C,
tGPDprimitive *tgpi)
gps->flag |= GP_STROKE_RECALC_CACHES;
gps->flag &= ~GP_STROKE_SELECT;
/* the polygon must be closed, so enabled cyclic */
- if (ELEM(tgpi->type,GP_STROKE_BOX ,GP_STROKE_CIRCLE))
+ if (ELEM(tgpi->type, GP_STROKE_BOX, GP_STROKE_CIRCLE)) {
gps->flag |= GP_STROKE_CYCLIC;
+ }
gps->flag |= GP_STROKE_3DSPACE;
@@ -360,10 +362,12 @@ static void gp_primitive_set_initdata(bContext *C,
tGPDprimitive *tgpi)
/* add new segment to curve */
static void gpencil_primitive_add_segment(tGPDprimitive *tgpi)
{
- if(tgpi->tot_stored_edges > 0)
+ if (tgpi->tot_stored_edges > 0) {
tgpi->tot_stored_edges += (tgpi->tot_edges - 1);
- else
+ }
+ else {
tgpi->tot_stored_edges += tgpi->tot_edges;
+ }
gpencil_primitive_allocate_memory(tgpi);
}
@@ -537,7 +541,7 @@ static void gp_primitive_arc(tGPDprimitive *tgpi, tGPspoint
*points2D)
corner[0] = midpoint[0] - (cp1[0] - midpoint[0]);
corner[1] = midpoint[1] - (cp1[1] - midpoint[1]);
-
+
for (int i = tgpi->tot_stored_edges; i < totpoints; i++) {
tGPspoint *p2d = &points2D[i];
p2d->x = corner[0] + (end[0] - corner[0]) * sinf(a) + (start[0]
- corner[0]) * cosf(a);
@@ -662,7 +666,7 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
gp_primitive_bezier(tgpi, points2D);
default:
break;
- }
+ }
/* convert screen-coordinates to 3D coordinates */
gp_session_validatebuffer(tgpi);
@@ -687,14 +691,17 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
/* need to restore the original projection settings before
packing up */
view3d_region_operator_needs_opengl(tgpi->win, tgpi->ar);
- ED_view3d_autodist_init(tgpi->depsgraph, tgpi->ar, tgpi->v3d,
(ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
+ ED_view3d_autodist_init(
+ tgpi->depsgraph, tgpi->ar, tgpi->v3d,
(ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0);
depth_arr = MEM_mallocN(sizeof(float) * gps->totpoints,
"depth_points");
tGPspoint *ptc = &points2D[0];
for (i = 0; i < gps->totpoints; i++, ptc++) {
round_v2i_v2fl(mval_i, &ptc->x);
- if ((ED_view3d_autodist_depth(tgpi->ar, mval_i,
depth_margin, depth_arr + i) == 0) &&
- (i && (ED_view3d_autodist_depth_seg(tgpi->ar,
mval_i, mval_prev, depth_margin + 1, depth_arr + i) == 0)))
+ if ((ED_view3d_autodist_depth(
+ tgpi->ar, mval_i, depth_margin, depth_arr
+ i) == 0) &&
+ (i && (ED_view3d_autodist_depth_seg(
+ tgpi->ar, mval_i, mval_prev,
depth_margin + 1, depth_arr + i) == 0)))
{
interp_depth = true;
}
@@ -724,7 +731,7 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
}
else {
if ((ts->gpencil_v3d_align &
GP_PROJECT_DEPTH_STROKE_ENDPOINTS) ||
- (ts->gpencil_v3d_align &
GP_PROJECT_DEPTH_STROKE_FIRST))
+ (ts->gpencil_v3d_align &
GP_PROJECT_DEPTH_STROKE_FIRST))
{
int first_valid = 0;
int last_valid = 0;
@@ -791,7 +798,7 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
/* apply jitter to position */
if ((brush->gpencil_settings->flag & GP_BRUSH_GROUP_RANDOM) &&
- (brush->gpencil_settings->draw_jitter > 0.0f))
+ (brush->gpencil_settings->draw_jitter > 0.0f))
{
float jitter;
@@ -803,7 +810,8 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
jitter = brush->gpencil_settings->draw_jitter;
}
- const float exfactor =
(brush->gpencil_settings->draw_jitter + 2.0f) *
(brush->gpencil_settings->draw_jitter + 2.0f); /* exponential value */
+ /* exponential value */
+ const float exfactor =
SQUARE(brush->gpencil_settings->draw_jitter + 2.0f);
const float rnd = BLI_rng_get_float(tgpi->rng);
const float fac = rnd * exfactor * jitter;
if (rnd > 0.5f) {
@@ -816,7 +824,7 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
/* apply randomness to pressure */
if ((brush->gpencil_settings->flag & GP_BRUSH_GROUP_RANDOM) &&
- (brush->gpencil_settings->draw_random_press > 0.0f))
+ (brush->gpencil_settings->draw_random_press > 0.0f))
{
float rnd = BLI_rng_get_float(tgpi->rng);
if (rnd > 0.5f) {
@@ -833,12 +841,12 @@ static void gp_primitive_update_strokes(bContext *C,
tGPDprimitive *tgpi)
strength *= curvef *
brush->gpencil_settings->draw_sensitivity;
strength *= brush->gpencil_settings->draw_strength;
}
-
+
CLAMP(strength, GPENCIL_STRENGTH_MIN, 1.0f);
/* apply randomness to color strength */
if ((brush->gpencil_settings->flag & GP_BRUSH_GROUP_RANDOM) &&
- (brush->gpencil_settings->draw_random_strength > 0.0f))
+ (brush->gpencil_settings->draw_random_strength > 0.0f))
{
const float rnd = BLI_rng_get_float(tgpi->rng);
if (rnd > 0.5f) {
@@ -1036,10 +1044,12 @@ static void gpencil_primitive_init(bContext *C,
wmOperator *op)
/* set parameters */
tgpi->type = RNA_enum_get(op->ptr, "type");
- if(ELEM(tgpi->type, GP_STROKE_ARC, GP_STROKE_CURVE))
+ if (ELEM(tgpi->type, GP_STROKE_ARC, GP_STROKE_CURVE)) {
tgpi->curve = true;
- else
+ }
+ else {
tgpi->curve = false;
+ }
/* set default edge count */
switch (tgpi->type) {
@@ -1175,7 +1185,7 @@ static void
gpencil_primitive_edit_event_handling(bContext *C, wmOperator *op, w
move = MOVE_ENDS;
WM_cursor_modal_set(win, BC_NSEW_SCROLLCURSOR);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
