[Bf-blender-cvs] [2afbd14c596] blender-v2.81-release: Fix T70887: GPencil edit lines are not displayed in the right place

Antonio Vazquez noreply at git.blender.org
Thu Oct 17 11:15:39 CEST 2019


Commit: 2afbd14c596746be22951e7a8cb9e1bc769a7128
Author: Antonio Vazquez
Date:   Thu Oct 17 11:15:22 2019 +0200
Branches: blender-v2.81-release
https://developer.blender.org/rB2afbd14c596746be22951e7a8cb9e1bc769a7128

Fix T70887: GPencil edit lines are not displayed in the right place

The lines were not using the matrix to calc the tarnsformation.

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

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 9599c91bfd7..68624540d08 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1286,12 +1286,14 @@ static void gpencil_draw_strokes(GpencilBatchCache *cache,
         if (!stl->g_data->shgrps_edit_line) {
           stl->g_data->shgrps_edit_line = DRW_shgroup_create(e_data->gpencil_line_sh,
                                                              psl->edit_pass);
+          DRW_shgroup_uniform_mat4(stl->g_data->shgrps_edit_line, "gpModelMatrix", ob->obmat);
         }
         if (!stl->g_data->shgrps_edit_point) {
           stl->g_data->shgrps_edit_point = DRW_shgroup_create(e_data->gpencil_edit_point_sh,
                                                               psl->edit_pass);
           const float *viewport_size = DRW_viewport_size_get();
           DRW_shgroup_uniform_vec2(stl->g_data->shgrps_edit_point, "Viewport", viewport_size, 1);
+          DRW_shgroup_uniform_mat4(stl->g_data->shgrps_edit_point, "gpModelMatrix", ob->obmat);
         }
 
         gpencil_add_editpoints_vertexdata(cache, ob, gpd, gpl, gpf, gps);



More information about the Bf-blender-cvs mailing list