[Bf-blender-cvs] [f547c396e19] master: Fix T70260: Stencil Paint Overlay Broken

Philipp Oeser noreply at git.blender.org
Thu Sep 26 14:24:00 CEST 2019


Commit: f547c396e19625699bf1b938484feb61b3798517
Author: Philipp Oeser
Date:   Thu Sep 26 14:12:08 2019 +0200
Branches: master
https://developer.blender.org/rBf547c396e19625699bf1b938484feb61b3798517

Fix T70260: Stencil Paint Overlay Broken

own error in rB078fcc62534c (doing the overlay only in 3d painting)

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

M	source/blender/editors/sculpt_paint/paint_cursor.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index 466615f4a94..a90f9d344a7 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -1272,6 +1272,9 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
     paint_calculate_rake_rotation(ups, brush, translation);
   }
 
+  /* draw overlay */
+  bool alpha_overlay_active = paint_draw_alpha_overlay(ups, brush, &vc, x, y, zoomx, mode);
+
   if (ups->draw_anchored) {
     final_radius = ups->anchored_size;
     copy_v2_fl2(translation,
@@ -1305,9 +1308,6 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused))
     uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 3, GPU_FETCH_FLOAT);
     immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
 
-    /* draw overlay */
-    bool alpha_overlay_active = paint_draw_alpha_overlay(ups, brush, &vc, x, y, zoomx, mode);
-
     /* TODO: as sculpt and other paint modes are unified, this
      * special mode of drawing will go away */
     Object *obact = vc.obact;



More information about the Bf-blender-cvs mailing list