[Bf-blender-cvs] [00038091050] greasepencil-edit-curve: GPencil: Display edit line sin Curve edit mode

Antonio Vazquez noreply at git.blender.org
Thu Jul 16 16:54:41 CEST 2020


Commit: 00038091050b09b4babf03e50958834219f08037
Author: Antonio Vazquez
Date:   Thu Jul 16 16:54:32 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB00038091050b09b4babf03e50958834219f08037

GPencil: Display edit line sin Curve edit mode

===================================================================

M	source/blender/draw/engines/overlay/overlay_gpencil.c

===================================================================

diff --git a/source/blender/draw/engines/overlay/overlay_gpencil.c b/source/blender/draw/engines/overlay/overlay_gpencil.c
index d4274618ea9..52d05376161 100644
--- a/source/blender/draw/engines/overlay/overlay_gpencil.c
+++ b/source/blender/draw/engines/overlay/overlay_gpencil.c
@@ -154,6 +154,18 @@ void OVERLAY_edit_gpencil_cache_init(OVERLAY_Data *vedata)
     DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
     DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
     DRW_shgroup_uniform_int_copy(grp, "curveHandleDisplay", pd->edit_curve.handle_display);
+
+    /* Edit lines. */
+    if (show_lines) {
+      sh = OVERLAY_shader_edit_gpencil_wire();
+      pd->edit_gpencil_wires_grp = grp = DRW_shgroup_create(sh, psl->edit_gpencil_curve_ps);
+      DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
+      DRW_shgroup_uniform_bool_copy(grp, "doMultiframe", show_multi_edit_lines);
+      DRW_shgroup_uniform_bool_copy(grp, "doWeightColor", is_weight_paint);
+      DRW_shgroup_uniform_bool_copy(grp, "hideSelect", hide_select);
+      DRW_shgroup_uniform_float_copy(grp, "gpEditOpacity", v3d->vertex_opacity);
+      DRW_shgroup_uniform_texture(grp, "weightTex", G_draw.weight_ramp);
+    }
   }
 
   /* control points for primitives and speed guide */



More information about the Bf-blender-cvs mailing list