[Bf-blender-cvs] [15ef1d4c802] master: Fix T72119: UV/Image Editor theme face colors with no effect
mano-wii
noreply at git.blender.org
Wed Jan 8 13:22:04 CET 2020
Commit: 15ef1d4c8026aea3319efdc118a2189d7d71b450
Author: mano-wii
Date: Wed Jan 8 09:21:25 2020 -0300
Branches: master
https://developer.blender.org/rB15ef1d4c8026aea3319efdc118a2189d7d71b450
Fix T72119: UV/Image Editor theme face colors with no effect
The `in int flag;` in `gpu_shader_2D_edituvs_faces_vert.glsl`
don't have the values `FACE_UV_ACTIVE` and `FACE_UV_SELECT`.
Add face flags then.
Original patch is from @EitanSomething
Differential revision: https://developer.blender.org/D6520
===================================================================
M source/blender/draw/intern/draw_cache_extract_mesh.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c
index e43c45a953d..c98494ebdd9 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh.c
@@ -2671,6 +2671,7 @@ static void extract_edituv_data_loop_bmesh(const MeshRenderData *mr,
EditLoopData *eldata = data->vbo_data + l;
memset(eldata, 0x0, sizeof(*eldata));
mesh_render_data_loop_flag(mr, loop, data->cd_ofs, eldata);
+ mesh_render_data_face_flag(mr, loop->f, data->cd_ofs, eldata);
mesh_render_data_loop_edge_flag(mr, loop, data->cd_ofs, eldata);
}
More information about the Bf-blender-cvs
mailing list