diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2019-05-13 20:20:58 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2019-05-14 11:57:04 +0300 |
| commit | 72a5e3f61a1478616a494d90bdcc565e20ee0858 (patch) | |
| tree | eaed31c04df21139dbe57f7f426740b5c5a461d9 /source/blender/draw/modes/object_mode.c | |
| parent | 92b4e96afed7bbc63e969f213266beaebc4c71b9 (diff) | |
Cleanup: DRW: Add and use DRW_shgroup_uniform_vec2_copy
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 6f6b4dc8d41..9702f99e802 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1010,9 +1010,7 @@ static void DRW_shgroup_empty_image(OBJECT_Shaders *sh_data, { DRWShadingGroup *grp = DRW_shgroup_create(sh_data->object_empty_image_wire, sgl->non_meshes); - /* TODO(fclem) implement DRW_shgroup_uniform_vec2_copy */ - DRW_shgroup_uniform_float_copy(grp, "aspectX", image_aspect[0]); - DRW_shgroup_uniform_float_copy(grp, "aspectY", image_aspect[1]); + DRW_shgroup_uniform_vec2_copy(grp, "aspect", image_aspect); DRW_shgroup_uniform_int_copy(grp, "depthMode", depth_mode); DRW_shgroup_uniform_float(grp, "size", &ob->empty_drawsize, 1); DRW_shgroup_uniform_vec2(grp, "offset", ob->ima_ofs, 1); @@ -1030,8 +1028,7 @@ static void DRW_shgroup_empty_image(OBJECT_Shaders *sh_data, if (tex && ((ob->color[3] > 0.0f) || !use_alpha_blend)) { DRWShadingGroup *grp = DRW_shgroup_create( sh_data->object_empty_image, (use_alpha_blend) ? sgl->image_empties : sgl->non_meshes); - DRW_shgroup_uniform_float_copy(grp, "aspectX", image_aspect[0]); - DRW_shgroup_uniform_float_copy(grp, "aspectY", image_aspect[1]); + DRW_shgroup_uniform_vec2_copy(grp, "aspect", image_aspect); DRW_shgroup_uniform_int_copy(grp, "depthMode", depth_mode); DRW_shgroup_uniform_float(grp, "size", &ob->empty_drawsize, 1); DRW_shgroup_uniform_vec2(grp, "offset", ob->ima_ofs, 1); |