Fix #115715 : Source transform is checked where result transform should be #115736

Manually merged
Campbell Barton merged 1 commits from Z-Map/blender:115715 into main 2023-12-05 08:04:12 +01:00
Contributor

There was a small mistake in the condition allowing a skip of applying transform during a boolean modifier.
With this, using an object with an identity transform matrix (so with its origin at world origin) as the modifier's object field wrongly skipped one transform space conversion.
I changed the comment above as getting a nullptr is not possible anymore due to a previous change.

This fixes issue #115715, it affected a blendfile made in blender 3.x that I re-opened after the update to blender 4.0.1 to find my modifier displacing meshes all over the place, I used this file to test my fix.

There was a small mistake in the condition allowing a skip of applying transform during a boolean modifier. With this, using an object with an identity transform matrix (so with its origin at world origin) as the modifier's object field wrongly skipped one transform space conversion. I changed the comment above as getting a nullptr is not possible anymore due to a previous change. This fixes issue #115715, it affected a blendfile made in blender 3.x that I re-opened after the update to blender 4.0.1 to find my modifier displacing meshes all over the place, I used this file to test my fix.
Author
Contributor

In this example the red object has a union modifier with the green one in the object field. (Origin of green is at world origin with no rotation or scale, Red's origin is the one shown on the screenshot)

In this example the red object has a union modifier with the green one in the object field. (Origin of green is at world origin with no rotation or scale, Red's origin is the one shown on the screenshot)

@Sergey Can you take a look. This also seems to fix blender/blender-addons#105012 and most likely blender/blender-addons#105000 as well.

@Sergey Can you take a look. This also seems to fix https://projects.blender.org/blender/blender-addons/issues/105012 and most likely https://projects.blender.org/blender/blender-addons/issues/105000 as well.
Philipp Oeser added this to the Modeling project 2023-12-04 09:23:19 +01:00
Philipp Oeser requested review from Sergey Sharybin 2023-12-04 09:23:35 +01:00
Quentin Loubière force-pushed 115715 from bf9561434c to a309feda3b 2023-12-04 17:36:56 +01:00 Compare

@ideasman42 Since Sergey is away atm, could you take a look at it please?

@ideasman42 Since Sergey is away atm, could you take a look at it please?
Brecht Van Lommel approved these changes 2023-12-04 23:11:46 +01:00
Brecht Van Lommel requested review from Campbell Barton 2023-12-04 23:12:08 +01:00

From what I understand we want to put this in 4.0.2, potentially to be released tomorrow?

If so, it would be good to have another pair of eyes before this lands.

From what I understand we want to put this in 4.0.2, potentially to be released tomorrow? If so, it would be good to have another pair of eyes before this lands.
Campbell Barton approved these changes 2023-12-05 07:57:18 +01:00
Campbell Barton manually merged commit c9dd5ce4cc into main 2023-12-05 08:04:12 +01:00

Fix LGTM, Committed with updated description.

Fix LGTM, Committed with updated description.
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset System
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Asset Browser Project
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
No Milestone
No project
No Assignees
5 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#115736
No description provided.