griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Viewport: Assert when drawing fly navigation aim symbol.

Browse Source 
The `immVertex2i` calls in `drawWalkPixel` will now cause an assert in
`immAttr2i` after 617858e453 because the component types are more
strictly enforced. Now switch to using floats to avoid asserts and
potentially drawing garbage in the viewport.

Pull Request: https://projects.blender.org/blender/blender/pulls/139429
This commit is contained in:
YimingWu
2025-05-26 10:32:39 +02:00
committed by Clément Foucault
parent c9ed2c28f3
commit 2ed21d7b90
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/editors/space_view3d/view3d_navigate_walk.cc
View File

@@ -352,9 +352,9 @@ static void drawWalkPixel(const bContext * /*C*/, ARegion *region, void *arg)
/* Draws an aim/cross in the center. */
WalkInfo *walk = static_cast<WalkInfo *>(arg);
const int outter_length = 24;
const int inner_length = 14;
int xoff, yoff;
float outter_length = 24;
float inner_length = 14;
float xoff, yoff;
rctf viewborder;
if (ED_view3d_cameracontrol_object_get(walk->v3d_camera_control)) {
@@ -378,20 +378,20 @@ static void drawWalkPixel(const bContext * /*C*/, ARegion *region, void *arg)
immBegin(GPU_PRIM_LINES, 8);
/* North. */
immVertex2i(pos, xoff, yoff + inner_length);
immVertex2i(pos, xoff, yoff + outter_length);
immVertex2f(pos, xoff, yoff + inner_length);
immVertex2f(pos, xoff, yoff + outter_length);
/* East. */
immVertex2i(pos, xoff + inner_length, yoff);
immVertex2i(pos, xoff + outter_length, yoff);
immVertex2f(pos, xoff + inner_length, yoff);
immVertex2f(pos, xoff + outter_length, yoff);
/* South. */
immVertex2i(pos, xoff, yoff - inner_length);
immVertex2i(pos, xoff, yoff - outter_length);
immVertex2f(pos, xoff, yoff - inner_length);
immVertex2f(pos, xoff, yoff - outter_length);
/* West. */
immVertex2i(pos, xoff - inner_length, yoff);
immVertex2i(pos, xoff - outter_length, yoff);
immVertex2f(pos, xoff - inner_length, yoff);
immVertex2f(pos, xoff - outter_length, yoff);
immEnd();
immUnbindProgram();