Fix #105640: LineArt: versioning for LRT_GPENCIL_MATCH_OUTPUT_VGROUP flag. #105852

Merged
YimingWu merged 2 commits from ChengduLittleA/blender:blender-v3.5-release into blender-v3.5-release 2023-03-17 16:31:12 +01:00
Member

This flag is moved to a different variable but the default value and
the versioning isn't correctly handled. Now fixed.

The file in #105640 is written with version 303 06, it's before the flag migration. The versioning code now check everything before 304 to set the correct flag in newer versions.

This flag is moved to a different variable but the default value and the versioning isn't correctly handled. Now fixed. The file in #105640 is written with version 303 06, it's before the flag migration. The versioning code now check everything before 304 to set the correct flag in newer versions.
YimingWu added 1 commit 2023-03-17 13:22:58 +01:00
8757a21a1a Fix #105640: LineArt: versioning for LRT_GPENCIL_MATCH_OUTPUT_VGROUP flag.
This flag is moved to a different variable but the default value and
the versioning isn't correctly handled. Now fixed.
Member

Note: 6aa29549e8 exposed this

Note: 6aa29549e889679112fd55f8d4a867c860646387 exposed this
Brecht Van Lommel reviewed 2023-03-17 15:40:13 +01:00
@ -3701,0 +3710,4 @@
if (lmd->flags & LRT_GPENCIL_INVERT_SOURCE_VGROUP) {
lmd->flags &= (~LRT_GPENCIL_INVERT_SOURCE_VGROUP);
lmd->calculation_flags |= LRT_GPENCIL_INVERT_SOURCE_VGROUP;
}

This will clear LRT_GPENCIL_INVERT_COLLECTION and LRT_GPENCIL_INVERT_SILHOUETTE_FILTER flags as they occupy the same bit. I don't think there's a way to fix this without breaking those settings.

This will clear `LRT_GPENCIL_INVERT_COLLECTION` and `LRT_GPENCIL_INVERT_SILHOUETTE_FILTER` flags as they occupy the same bit. I don't think there's a way to fix this without breaking those settings.

Some information was just irretrievably lost due to the bug. If those other flags are rarely used then this is probably better, but I'm not familiar enough with this to know.

Some information was just irretrievably lost due to the bug. If those other flags are rarely used then this is probably better, but I'm not familiar enough with this to know.

If the other flags are rarely used and the fix in this PR is done, it can be made to only apply to the version range that is known to have the wrong flags.

If the other flags are rarely used and the fix in this PR is done, it can be made to only apply to the version range that is known to have the wrong flags.
Author
Member

@brecht The LRT_GPENCIL_INVERT_COLLECTION flag actually cause more prominent error and is also placed at the collection filter drop down box where it's seen and frequently used. The feature from the original bug report doesn't gets used a lot, and from what I gathered, people just attributed the error as a versioning issue and redid the setup.

My opinion is to not touch the versioning code, since the flag bit change already took place more than a year ago, but just fix the default value.

@brecht The `LRT_GPENCIL_INVERT_COLLECTION` flag actually cause more prominent error and is also placed at the collection filter drop down box where it's seen and frequently used. The feature from the original bug report doesn't gets used a lot, and from what I gathered, people just attributed the error as a versioning issue and redid the setup. My opinion is to not touch the versioning code, since the flag bit change already took place more than a year ago, but just fix the default value.

Fine with me to not touch the versioning code then.

Fine with me to not touch the versioning code then.
YimingWu added 1 commit 2023-03-17 16:07:20 +01:00
YimingWu merged commit 11b16c4ae3 into blender-v3.5-release 2023-03-17 16:31:12 +01:00
YimingWu deleted branch blender-v3.5-release 2023-03-17 16:31:14 +01:00
YimingWu added this to the 3.5 milestone 2023-03-20 09:59:18 +01:00
Sign in to join this conversation.
No reviewers
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
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
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
3 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#105852
No description provided.