blender/blender
154
492
Fork 730
Code Issues 6.7k Pull Requests 904 Projects 18 Wiki Activity

Fix #106235: Use consistent order for multi-input socket links #106320

Closed
Iliya Katushenock wants to merge 17 commits from mod_moder:fix_internal_link_drawing into main
pull from: mod_moder:fix_internal_link_drawing
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 10 Commits 17 Files Changed 4 +26 -3
Iliya Katushenock commented 2023-03-30 17:27:59 +02:00
Member
Copy Link

Make indexing the same in all parts of the code:

  • All links connected to the multi-input socket are now sorted from top to bottom.
  • Link indexes go from top to bottom.
  • The cache of linked links is sorted from top to bottom.
  • Lazy function evaluatro use first link, connected to multi-input socket (top one).
Make indexing the same in all parts of the code: - All links connected to the multi-input socket are now sorted from top to bottom. - Link indexes go from top to bottom. - The cache of linked links is sorted from top to bottom. - Lazy function evaluatro use first link, connected to multi-input socket (top one).
Iliya Katushenock added 1 commit 2023-03-30 17:28:13 +02:00
Iliya Katushenock added this to the Nodes & Physics project 2023-03-30 17:28:19 +02:00
Iliya Katushenock added the
Interest
Geometry Nodes
 label 2023-03-30 17:28:25 +02:00
Iliya Katushenock requested review from Hans Goudey 2023-03-30 17:28:30 +02:00
Iliya Katushenock added 1 commit 2023-03-30 17:28:55 +02:00
Iliya Katushenock commented 2023-03-30 17:29:21 +02:00
Author
Member
Copy Link

Oh wait, I think I forgot that we need a fix for 3.4 and 3.5

Oh wait, I think I forgot that we need a fix for 3.4 and 3.5
Hans Goudey commented 2023-03-30 17:37:46 +02:00
Member
Copy Link

Hmm, 3.4 isn't updated anymore, and this isn't a critical bug, it's just a visual thing. So I don't think it needs to be backported actually.

Hmm, 3.4 isn't updated anymore, and this isn't a critical bug, it's just a visual thing. So I don't think it needs to be backported actually.
Iliya Katushenock commented 2023-03-30 18:06:52 +02:00
Author
Member
Copy Link

Then it's all right. I also now realized that it can be done a little more cleanly, so I'll update this.

Then it's all right. I also now realized that it can be done a little more cleanly, so I'll update this.
Iliya Katushenock added 2 commits 2023-03-30 23:22:07 +02:00
Lukas Tönne approved these changes 2023-03-31 11:21:29 +02:00
Lukas Tönne left a comment
Member
Copy Link

Looks fine.

Looks fine.
Hans Goudey requested changes 2023-03-31 14:38:46 +02:00
Hans Goudey left a comment
Member
Copy Link

Explicitly indicate that the internal link is the last in a multi-input socket.

Am I missing something? Seems to me that it's the first input that's passed through, not the last.

image

>Explicitly indicate that the internal link is the last in a multi-input socket. Am I missing something? Seems to me that it's the _first_ input that's passed through, not the last. ![image](/attachments/06e505a8-d22d-442a-8e8e-32a541fcb55f)
Iliya Katushenock added 1 commit 2023-03-31 16:18:15 +02:00 
Make fix of all indefing, directly linked link sorting, unconnected multiinput socket offset.
Iliya Katushenock changed title from Fix #106235: Fix drawing internal link as connected to last link in multi-input socket to Fix #106235: Refactoring: Consist directly linked links & multi input index & drawing index & evaluated index 2023-03-31 16:20:40 +02:00
Iliya Katushenock requested review from Hans Goudey 2023-03-31 16:28:03 +02:00
Iliya Katushenock added 1 commit 2023-03-31 16:28:31 +02:00
Iliya Katushenock commented 2023-03-31 16:30:41 +02:00
Author
Member
Copy Link

Problems: maybe versioning is needed, not sure... Links from old sessions are reversed. But I'm not sure if it's fixable or serious.

Problems: maybe versioning is needed, not sure... Links from old sessions are reversed. But I'm not sure if it's fixable or serious.
Iliya Katushenock requested review from Lukas Tönne 2023-03-31 16:31:38 +02:00
Iliya Katushenock changed title from Fix #106235: Refactoring: Consist directly linked links & multi input index & drawing index & evaluated index to Refactoring: Consist Directly linked links & Multi-input index & Drawing order & Evaluated behavior 2023-03-31 18:23:11 +02:00
Iliya Katushenock changed title from Refactoring: Consist Directly linked links & Multi-input index & Drawing order & Evaluated behavior to Refactoring: Consist: Directly linked links & index & drawing order & evaluated behavior of multi-input links 2023-03-31 18:25:12 +02:00
Iliya Katushenock commented 2023-04-03 20:48:59 +02:00
Author
Member
Copy Link

Explicitly indicate that the internal link is the last in a multi-input socket.

Am I missing something? Seems to me that it's the first input that's passed through, not the last.

image

Now yes, this is the first link.

> >Explicitly indicate that the internal link is the last in a multi-input socket. > > Am I missing something? Seems to me that it's the _first_ input that's passed through, not the last. > > ![image](/attachments/06e505a8-d22d-442a-8e8e-32a541fcb55f) Now yes, this is the first link.
Iliya Katushenock added 1 commit 2023-04-13 22:58:03 +02:00
Iliya Katushenock added the
Interest
User Interface
 label 2023-05-14 13:45:03 +02:00
Iliya Katushenock changed title from Refactoring: Consist: Directly linked links & index & drawing order & evaluated behavior of multi-input links to Refactoring: Geometry Node: Multi-input link indices direction 2023-05-14 13:46:57 +02:00
Iliya Katushenock changed title from Refactoring: Geometry Node: Multi-input link indices direction to Refactoring: Geometry Node: Multi-input socket links indices direction 2023-05-14 15:04:04 +02:00
Iliya Katushenock added 3 commits 2023-07-06 12:37:36 +02:00
Iliya Katushenock changed title from Refactoring: Geometry Node: Multi-input socket links indices direction to Fix: Enumerate links connected to multi-input socket in consist order 2023-07-06 12:38:55 +02:00
Iliya Katushenock changed title from Fix: Enumerate links connected to multi-input socket in consist order to Fix #106235: Enumerate links connected to multi-input socket in consist order 2023-07-06 12:39:10 +02:00
Iliya Katushenock added 1 commit 2023-08-31 20:08:06 +02:00
Hans Goudey changed title from Fix #106235: Enumerate links connected to multi-input socket in consist order to Fix #106235: Use consistent order for multi-input socket links 2023-09-04 23:38:22 +02:00
Hans Goudey commented 2023-09-04 23:39:19 +02:00
Member
Copy Link

Does this have any consequences for backwards or forwards compatibility?

Does this have any consequences for backwards or forwards compatibility?
Iliya Katushenock commented 2023-09-05 06:01:39 +02:00
Author
Member
Copy Link

I'll need to be rechecked. In theory, only the visual order of the links changes, but not how it works.

I'll need to be rechecked. In theory, only the visual order of the links changes, but not how it works.
Iliya Katushenock added the
Interest
Compatibility
 label 2023-09-05 14:28:35 +02:00
Iliya Katushenock commented 2023-09-05 15:04:41 +02:00
Author
Member
Copy Link

Yeah, this actually change order of inputs and now files, opened in 3.6, will look different.

Yeah, this actually change order of inputs and now files, opened in 3.6, will look different.
Iliya Katushenock added 3 commits 2023-09-05 15:06:50 +02:00
Iliya Katushenock commented 2023-10-14 10:46:49 +02:00
Author
Member
Copy Link

Not sure how to fix this now. If we send this to 3.6, then the versioning should take into account all versions 4.0 and 4.1 before fixing them...

Not sure how to fix this now. If we send this to 3.6, then the versioning should take into account all versions 4.0 and 4.1 before fixing them...
Iliya Katushenock added 3 commits 2023-10-14 10:47:30 +02:00
Jacques Lucke commented 2024-03-01 22:39:46 +01:00
Member
Copy Link

Closing this as it seems not worth the effort to reverse the order. The compatibility story is too annoying. We could rename the the index to a sort_id though internally. Also see 8f36281787.

Closing this as it seems not worth the effort to reverse the order. The compatibility story is too annoying. We could rename the the `index` to a `sort_id` though internally. Also see 8f362817875a9b2bcdd77e53130672624dadb2da.
Jacques Lucke closed this pull request 2024-03-01 22:39:49 +01:00
Iliya Katushenock deleted branch fix_internal_link_drawing 2024-03-02 09:33:03 +01:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No reviewers
Hans Goudey
Lukas Tönne
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset System
Asset datablocks, libraries, browser and shelf

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
Backward and forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
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
Viewport & EEVEE

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Wayland windowing on Unix

  
Interest
Workbench

  
Interest: X11

Xorg/X11 windowing

  
Legacy
Asset Browser Project

Archived

  
Legacy
Blender 2.8 Project

Archived

  
Legacy
Milestone 1: Basic, Local Asset Browser

Archived

  
Legacy
OpenGL Error

Archived

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Related to security, https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
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

  
Module
Viewport & EEVEE

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Severity
High

  
Severity
Low

  
Severity
Normal

  
Severity
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

Archived

  
Type
Report

Archived

  
Type
To Do

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
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
Viewport & EEVEE
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
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
Module
Viewport & EEVEE
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Severity
High
Severity
Low
Severity
Normal
Severity
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
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Nodes & Physics
Assignees
Clear assignees
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#106320
No description provided.
Delete Branch "mod_moder:fix_internal_link_drawing"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?