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:
authorClément Foucault <foucault.clem@gmail.com>2020-05-14 17:23:24 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-05-14 17:23:24 +0300
commitbd80c216355655830bde7f4b569b554dbd34d575 (patch)
treea1a8ca50a425e024df5547c23c52fd2f1e54ed57 /source/blender/draw/engines/overlay/overlay_edit_curve.c
parentfc4f2571ba29e8f29e7f1d8a915f3a9e38229a28 (diff)
parentb7386c66f9fdd8b6a3139c1ea4a4256c9729aab5 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/draw/engines/overlay/overlay_edit_curve.c')
-rw-r--r--source/blender/draw/engines/overlay/overlay_edit_curve.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_edit_curve.c b/source/blender/draw/engines/overlay/overlay_edit_curve.c
index d9b9fac6b4b..6456d6868a5 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_curve.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_curve.c
@@ -66,6 +66,7 @@ void OVERLAY_edit_curve_cache_init(OVERLAY_Data *vedata)
sh = OVERLAY_shader_edit_curve_point();
pd->edit_curve_points_grp = grp = DRW_shgroup_create(sh, psl->edit_curve_handle_ps);
+ DRW_shgroup_uniform_bool_copy(grp, "showCurveHandles", pd->edit_curve.show_handles);
DRW_shgroup_uniform_block(grp, "globalsBlock", G_draw.block_ubo);
}
}
@@ -94,7 +95,7 @@ void OVERLAY_edit_curve_cache_populate(OVERLAY_Data *vedata, Object *ob)
DRW_shgroup_call_no_cull(pd->edit_curve_handle_grp, geom, ob);
}
- geom = DRW_cache_curve_vert_overlay_get(ob, pd->edit_curve.show_handles);
+ geom = DRW_cache_curve_vert_overlay_get(ob);
if (geom) {
DRW_shgroup_call_no_cull(pd->edit_curve_points_grp, geom, ob);
}
@@ -110,7 +111,7 @@ void OVERLAY_edit_surf_cache_populate(OVERLAY_Data *vedata, Object *ob)
DRW_shgroup_call_no_cull(pd->edit_curve_handle_grp, geom, ob);
}
- geom = DRW_cache_curve_vert_overlay_get(ob, false);
+ geom = DRW_cache_curve_vert_overlay_get(ob);
if (geom) {
DRW_shgroup_call_no_cull(pd->edit_curve_points_grp, geom, ob);
}