Commit: b4998548ab1edc513a47038872b3282efe6dfef9
Author: Campbell Barton
Date: Sun Jul 1 08:42:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb4998548ab1edc513a47038872b3282efe6dfef9
Cleanup: use '_len' suffix for line stipple
===================================================================
M source/blender/draw/intern/draw_common.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/sculpt_paint/paint_stroke.c
M source/blender/editors/space_clip/clip_draw.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_nla/nla_draw.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_manipulator_ruler.c
M source/blender/editors/space_view3d/view3d_ruler.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_constraints.c
M source/blender/editors/util/ed_util.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/gpu/shaders/gpu_shader_2D_line_dashed_frag.glsl
M source/blender/gpu/shaders/gpu_shader_2D_line_dashed_geom.glsl
M source/blender/gpu/shaders/gpu_shader_2D_line_dashed_width_geom.glsl
M source/blender/windowmanager/intern/wm_gesture.c
===================================================================
diff --git a/source/blender/draw/intern/draw_common.c
b/source/blender/draw/intern/draw_common.c
index eff0d4c676e..a1c60be4742 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -261,7 +261,7 @@ DRWShadingGroup
*shgroup_dynlines_dashed_uniform_color(DRWPass *pass, float colo
DRW_shgroup_uniform_vec2(grp, "viewport_size", DRW_viewport_size_get(),
1);
DRW_shgroup_uniform_float(grp, "dash_width", &dash_width, 1);
DRW_shgroup_uniform_float(grp, "dash_factor", &dash_factor, 1);
- DRW_shgroup_uniform_int_copy(grp, "num_colors", 0); /* "simple" mode */
+ DRW_shgroup_uniform_int_copy(grp, "colors_len", 0); /* "simple" mode */
return grp;
}
diff --git a/source/blender/editors/gpencil/gpencil_paint.c
b/source/blender/editors/gpencil/gpencil_paint.c
index 0ae45a9fde8..416649cdfaf 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1895,7 +1895,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int
x, int y, void *p_ptr)
immUniform2f("viewport_size", viewport_size[2],
viewport_size[3]);
immUniformColor4f(1.0f, 0.39f, 0.39f, 0.78f);
- immUniform1i("num_colors", 0); /* "simple" mode */
+ immUniform1i("colors_len", 0); /* "simple" mode */
immUniform1f("dash_width", 12.0f);
immUniform1f("dash_factor", 0.5f);
diff --git a/source/blender/editors/interface/interface_draw.c
b/source/blender/editors/interface/interface_draw.c
index ab85a3d5326..da1135da00a 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -1333,7 +1333,7 @@ static void ui_draw_colorband_handle(
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 2); /* "advanced" mode */
+ immUniform1i("colors_len", 2); /* "advanced" mode */
immUniformArray4fv("colors", (float *)(float[][4]){{0.8f, 0.8f,
0.8f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, 2);
immUniform1f("dash_width", active ? 4.0f : 2.0f);
diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c
b/source/blender/editors/sculpt_paint/paint_stroke.c
index ee888c71659..91242b68797 100644
--- a/source/blender/editors/sculpt_paint/paint_stroke.c
+++ b/source/blender/editors/sculpt_paint/paint_stroke.c
@@ -189,7 +189,7 @@ static void paint_draw_line_cursor(bContext *C, int x, int
y, void *customdata)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2], viewport_size[3]);
- immUniform1i("num_colors", 2); /* "advanced" mode */
+ immUniform1i("colors_len", 2); /* "advanced" mode */
const float alpha = (float)paint->paint_cursor_col[3] / 255.0f;
immUniformArray4fv("colors", (float *)(float[][4]){{0.0f, 0.0f, 0.0f,
alpha}, {1.0f, 1.0f, 1.0f, alpha}}, 2);
immUniform1f("dash_width", 6.0f);
diff --git a/source/blender/editors/space_clip/clip_draw.c
b/source/blender/editors/space_clip/clip_draw.c
index d91e039ecb6..c0d17fabe0d 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -368,7 +368,7 @@ static void draw_stabilization_border(SpaceClip *sc,
ARegion *ar, int width, int
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* "simple" mode */
+ immUniform1i("colors_len", 0); /* "simple" mode */
immUniformColor4f(1.0f, 1.0f, 1.0f, 0.0f);
immUniform1f("dash_width", 6.0f);
immUniform1f("dash_factor", 0.5f);
@@ -672,7 +672,7 @@ static void draw_marker_areas(SpaceClip *sc,
MovieTrackingTrack *track, MovieTra
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* "simple" mode */
+ immUniform1i("colors_len", 0); /* "simple" mode */
/* marker position and offset position */
if ((track->flag & SELECT) == sel && (marker->flag & MARKER_DISABLED)
== 0) {
@@ -1214,7 +1214,7 @@ static void draw_plane_marker_ex(SpaceClip *sc, Scene
*scene, MovieTrackingPlane
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* "simple" mode */
+ immUniform1i("colors_len", 0); /* "simple" mode */
if (draw_plane_quad) {
const bool stipple = !draw_outline && tiny;
diff --git a/source/blender/editors/space_graph/graph_draw.c
b/source/blender/editors/space_graph/graph_draw.c
index 87fe4a62343..16817b89d11 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -96,7 +96,7 @@ static void draw_fcurve_modifier_controls_envelope(FModifier
*fcm, View2D *v2d)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* Simple dashes. */
+ immUniform1i("colors_len", 0); /* Simple dashes. */
immUniformColor3f(0.0f, 0.0f, 0.0f);
immUniform1f("dash_width", 10.0f);
immUniform1f("dash_factor", 0.5f);
@@ -850,7 +850,7 @@ static void graph_draw_driver_debug(bAnimContext *ac, ID
*id, FCurve *fcu)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* Simple dashes. */
+ immUniform1i("colors_len", 0); /* Simple dashes. */
/* No curve to modify/visualize the result?
* => We still want to show the 1-1 default...
@@ -971,7 +971,7 @@ void graph_draw_ghost_curves(bAnimContext *ac, SpaceIpo
*sipo, ARegion *ar)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* Simple dashes. */
+ immUniform1i("colors_len", 0); /* Simple dashes. */
immUniform1f("dash_width", 20.0f);
immUniform1f("dash_factor", 0.5f);
@@ -1057,7 +1057,7 @@ void graph_draw_curves(bAnimContext *ac, SpaceIpo *sipo,
ARegion *ar, View2DGrid
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] /
UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* Simple dashes. */
+ immUniform1i("colors_len", 0); /* Simple dashes. */
if (BKE_fcurve_is_protected(fcu)) {
/* protected curves (non editable) are drawn
with dotted lines */
diff --git a/source/blender/editors/space_image/image_draw.c
b/source/blender/editors/space_image/image_draw.c
index 11e06c168b4..ecd608b707a 100644
--- a/source/blender/editors/space_image/image_draw.c
+++ b/source/blender/editors/space_image/image_draw.c
@@ -582,7 +582,7 @@ void draw_image_sample_line(SpaceImage *sima)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 2); /* Advanced dashes. */
+ immUniform1i("colors_len", 2); /* Advanced dashes. */
immUniformArray4fv("colors", (float *)(float[][4]){{1.0f, 1.0f,
1.0f, 1.0f}, {0.0f, 0.0f, 0.0f, 1.0f}}, 2);
immUniform1f("dash_width", 2.0f);
diff --git a/source/blender/editors/space_nla/nla_draw.c
b/source/blender/editors/space_nla/nla_draw.c
index 16fb3576ae8..27ed7a08aa8 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -185,7 +185,7 @@ static void nla_actionclip_draw_markers(NlaStrip *strip,
float yminc, float ymax
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* "simple" mode */
+ immUniform1i("colors_len", 0); /* "simple" mode */
immUniform1f("dash_width", 6.0f);
immUniform1f("dash_factor", 0.5f);
}
@@ -373,7 +373,7 @@ static uint nla_draw_use_dashed_outlines(float color[4],
bool muted)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* Simple dashes. */
+ immUniform1i("colors_len", 0); /* Simple dashes. */
immUniformColor3fv(color);
/* line style: dotted for muted */
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c
b/source/blender/editors/space_sequencer/sequencer_draw.c
index bf538611852..e6e37628c43 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1049,7 +1049,7 @@ static void sequencer_draw_borders(const SpaceSeq *sseq,
const View2D *v2d, cons
immUniform2f("viewport_size", viewport_size[2] / UI_DPI_FAC,
viewport_size[3] / UI_DPI_FAC);
immUniformThemeColor(TH_BACK);
- immUniform1i("num_colors", 0); /* Simple dashes. */
+ immUniform1i("colors_len", 0); /* Simple dashes. */
immUniform1f("dash_width", 6.0f);
immUniform1f("dash_factor", 0.5f);
diff --git a/source/blender/editors/space_text/text_draw.c
b/source/blender/editors/space_text/text_draw.c
index 99305b143c6..9b4e71ae7a0 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -1510,7 +1510,7 @@ void draw_text_main(SpaceText *st, ARegion *ar)
GPU_viewport_size_getf(viewport_size);
immUniform2f("viewport_size", viewport_size[2] /
UI_DPI_FAC, viewport_size[3] / UI_DPI_FAC);
- immUniform1i("num_colors", 0); /* "simple" mode */
+ immUniform1i("colors_len", 0); /* "simple" mode */
immUniformThemeColor(TH_GRID); /* same color as line
number background */
immUniform1f("dash_width", 2.0f);
immUniform1f("dash_factor", 0.5f);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index e9c2ddbab76..1ffdf8923f5 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -521,7 +521,7 @@ static void drawviewborder(Scene *scene, Depsgraph
*depsgraph, ARegion *ar, View
GPU_viewport_size_getf(viewport_size);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
