Fix #108911: Fcurve Proportional editing circle draws wrong #108979

Merged

Philipp Oeser merged 2 commits from lichtwerk/blender:108911 into blender-v3.6-release

2023-06-15 09:45:28 +02:00

Philipp Oeser commented

2023-06-14 15:49:30 +02:00

Member

Since we scale the GPU matrix a certain way (in order to draw a round
circle even for different UI x/y scaling), we have to also compensate
with GPU matrix translation (instead of drawing the raw
frame/value as coords untranslated).

There might be ways to solve this differently (e.g. manipulating the passed
coords instead of the GPU matrix or having a version of imm_drawcircball
that can do this in a way that compensates UI view scaling), but this seems
to be the most straightforward.

Thx @mano-wii hinting at the way to do this with GPU matrix alone.

Should probably go into 3.3 LTS as well.

Since we scale the GPU matrix a certain way (in order to draw a round circle even for different UI x/y scaling), we have to also compensate with GPU matrix translation (instead of drawing the raw frame/value as coords untranslated). There might be ways to solve this differently (e.g. manipulating the passed coords instead of the GPU matrix or having a version of imm_drawcircball that can do this in a way that compensates UI view scaling), but this seems to be the most straightforward. Thx @mano-wii hinting at the way to do this with GPU matrix alone. Should probably go into 3.3 LTS as well.

Philipp Oeser added 1 commit 2023-06-14 15:49:40 +02:00

94dacaf441 Fix #108911 : Fcurve Proportional editing circle draws wrong

Since we set up the GPU matrix a certain way (in order to draw a round
circle even for different UI x/y scaling), we have to tweak where the
center of that circle draws accordingly (instead of passing the raw
frame/value as coords).

There might be ways to solve this differently (e.g. setting up matrix
manipulation different or having a version of imm_drawcircball that can
do this in a way that compensates UI view scaling), but havent found a
quick way to do this and fixing it like done here seemed straightforward
enough to make a PR from.

Should probably go into 3.3 LTS as well.

Philipp Oeser requested review from Germano Cavalcante 2023-06-14 15:49:48 +02:00

Philipp Oeser requested review from Brad Clark 2023-06-14 15:50:07 +02:00

Philipp Oeser added this to the Modeling project 2023-06-14 15:50:14 +02:00

Philipp Oeser added the

Animation & Rigging

labels 2023-06-14 15:50:31 +02:00

Germano Cavalcante approved these changes 2023-06-14 16:18:31 +02:00

Germano Cavalcante left a comment

Member

It looks ok.
But I wonder if we can use GPU_matrix_translate_2f instead of copying t->center_global;

I think it would be something like this:
GPU_matrix_translate_2f(0.0f, (t->center_global[1] / fac_scale) - t->center_global[1])

It looks ok. But I wonder if we can use `GPU_matrix_translate_2f` instead of copying `t->center_global`; I think it would be something like this: `GPU_matrix_translate_2f(0.0f, (t->center_global[1] / fac_scale) - t->center_global[1])`

Brad Clark commented

2023-06-14 20:55:48 +02:00

Member

If that fixes the draw so it shows up in the correct place then approved :)

Even better if it could get fixed for 3.6 and back ported because it really makes it almost impossible to use.

If that fixes the draw so it shows up in the correct place then approved :) Even better if it could get fixed for 3.6 and back ported because it really makes it almost impossible to use.

Philipp Oeser added 1 commit 2023-06-15 09:29:10 +02:00

c23c0c653f manipulate GPU matrix instead of position vector

Philipp Oeser merged commit d61d2e5f59 into blender-v3.6-release

2023-06-15 09:45:28 +02:00

Philipp Oeser referenced this issue from a commit

2023-06-15 09:45:29 +02:00

Fix #108911: Fcurve Proportional editing circle draws wrong

Philipp Oeser deleted branch 108911

2023-06-15 09:45:31 +02:00

Pratik Borhade commented

2023-06-15 11:53:13 +02:00

Member

Should probably go into 3.3 LTS as well.

Can we do this? :)

> Should probably go into 3.3 LTS as well. Can we do this? :)

Philipp Oeser commented

2023-06-15 12:33:18 +02:00

Author

Member

Should probably go into 3.3 LTS as well.

Can we do this? :)

yep, added again (already did this, but somehow this got edited away again -- by myself probably...)

> > Should probably go into 3.3 LTS as well. > > Can we do this? :) yep, added again (already did this, but somehow this got edited away again -- by myself probably...)

Philipp Oeser referenced this issue from a commit

2023-06-15 14:05:36 +02:00

Fix #108911: Fcurve Proportional editing circle draws wrong

Philipp Oeser referenced this issue from a commit

2023-06-15 15:06:28 +02:00

Fix #108911: Fcurve Proportional editing circle draws wrong

Sign in to join this conversation.

No reviewers

No Label

Animation & Rigging

Asset Browser Project Overview

Automated Testing

Blender Asset Bundle

Dependency Graph

Development Management

EEVEE & Viewport

Images & Movies

Motion Tracking

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Render Pipeline

Sculpt, Paint & Texture

Video Sequencer

Virtual Reality

Blender 2.8 Project

Milestone 1: Basic, Local Asset Browser

Good First Issue

Animation & Rigging

Development Management

EEVEE & Viewport

Nodes & Physics

Pipeline, Assets & IO

Platforms, Builds & Tests

Render & Cycles

Sculpt, Paint & Texture

Needs Info from Developers

Needs Information from User

No Milestone

No project

No Assignees

4 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#108979

No description provided.