[Bf-blender-cvs] [0389895f25e] tmp-overlay-engine: Cleanup: Use DRW_shgroup_uniform_vec4_copy

Clément Foucault noreply at git.blender.org
Fri Nov 15 01:35:28 CET 2019


Commit: 0389895f25ec07a55eb0f1afd9ec8a3804999c4a
Author: Clément Foucault
Date:   Wed Nov 13 16:28:04 2019 +0100
Branches: tmp-overlay-engine
https://developer.blender.org/rB0389895f25ec07a55eb0f1afd9ec8a3804999c4a

Cleanup: Use DRW_shgroup_uniform_vec4_copy

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

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

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

diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.c b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
index 44a43eef1f9..6390ac42045 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_mesh.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.c
@@ -156,17 +156,17 @@ void OVERLAY_edit_mesh_cache_init(OVERLAY_Data *vedata)
     sh = OVERLAY_shader_edit_mesh_normal_face();
     pd->edit_mesh_fnormals_grp = grp = DRW_shgroup_create(sh, psl->edit_mesh_normals_ps);
     DRW_shgroup_uniform_float_copy(grp, "normalSize", size_normal);
-    DRW_shgroup_uniform_vec4(grp, "color", G_draw.block.colorNormal, 1);
+    DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorNormal);
 
     sh = OVERLAY_shader_edit_mesh_normal_vert();
     pd->edit_mesh_vnormals_grp = grp = DRW_shgroup_create(sh, psl->edit_mesh_normals_ps);
     DRW_shgroup_uniform_float_copy(grp, "normalSize", size_normal);
-    DRW_shgroup_uniform_vec4(grp, "color", G_draw.block.colorVNormal, 1);
+    DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorVNormal);
 
     sh = OVERLAY_shader_edit_mesh_normal_loop();
     pd->edit_mesh_lnormals_grp = grp = DRW_shgroup_create(sh, psl->edit_mesh_normals_ps);
     DRW_shgroup_uniform_float_copy(grp, "normalSize", size_normal);
-    DRW_shgroup_uniform_vec4(grp, "color", G_draw.block.colorLNormal, 1);
+    DRW_shgroup_uniform_vec4_copy(grp, "color", G_draw.block.colorLNormal);
   }
   {
     /* Mesh Analysis Pass */



More information about the Bf-blender-cvs mailing list