blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

Fix #113194: show the single value for sockets of type field #113244

Merged
Jacques Lucke merged 1 commits from Vasilis-Milios/blender:fix-issue-113194 into blender-v4.0-release 2023-10-04 19:21:15 +02:00
Conversation 11 Commits 1 Files Changed 3 +6 -2
Vasilis-Milios commented 2023-10-04 12:21:06 +02:00
Contributor
Copy Link
No description provided.
Vasilis-Milios requested review from Dalai Felinto 2023-10-04 12:23:07 +02:00
Vasilis-Milios requested review from Jacques Lucke 2023-10-04 12:23:07 +02:00
Vasilis-Milios commented 2023-10-04 12:25:18 +02:00
Author
Contributor
Copy Link

Hopefully didn't screw this up 😅

Hopefully didn't screw this up 😅
Iliya Katushenock reviewed 2023-10-04 12:30:35 +02:00
source/blender/blenkernel/BKE_node_tree_anonymous_attributes.hh Outdated
@ -76,5 +76,6 @@ struct AnonymousAttributeInferencingResult {
Array<const nodes::aal::RelationsInNode *> get_relations_by_node(const bNodeTree &tree,
ResourceScope &scope);
bool update_anonymous_attribute_relations(bNodeTree &tree);
bool is_possible_field_socket(const eNodeSocketDatatype type);
Iliya Katushenock commented 2023-10-04 12:29:40 +02:00
Member
Copy Link

const eNodeSocketDatatype type -> eNodeSocketDatatype type (Const modifier for trivial type arguments can be omitted in header declaration).

`const eNodeSocketDatatype type` -> `eNodeSocketDatatype type` (Const modifier for trivial type arguments can be omitted in header declaration).
👍 1
Vasilis-Milios marked this conversation as resolved
source/blender/editors/space_node/drawnode.cc Outdated
@ -1513,3 +1514,3 @@
if (interface_socket->flag & NODE_INTERFACE_SOCKET_INPUT && node_tree->type == NTREE_GEOMETRY) {
uiItemR(col, &ptr, "hide_in_modifier", DEFAULT_FLAGS, nullptr, ICON_NONE);
uiItemR(col, &ptr, "force_non_field", DEFAULT_FLAGS, nullptr, ICON_NONE);
if (blender::bke::anonymous_attribute_inferencing::is_possible_field_socket(type)) {
Iliya Katushenock commented 2023-10-04 12:30:25 +02:00
Member
Copy Link

namespace blender::ed::space_node { this is already in blender namespace, so this can be bke::anonymous_attribute_inferencing.

`namespace blender::ed::space_node {` this is already in `blender` namespace, so this can be `bke::anonymous_attribute_inferencing`.
👍 1
Vasilis-Milios marked this conversation as resolved
Iliya Katushenock added this to the Nodes & Physics project 2023-10-04 12:30:50 +02:00
Jacques Lucke commented 2023-10-04 13:17:30 +02:00
Member
Copy Link

Oh, I just moved that function around myself in beac6599fb. Bad timing, sry. Can you update the patch?

Oh, I just moved that function around myself in beac6599fb1465ca550fe241ae0225f475bf84ff. Bad timing, sry. Can you update the patch?
Vasilis-Milios commented 2023-10-04 13:47:46 +02:00
Author
Contributor
Copy Link

No worries :).
Updated!

No worries :). Updated!
Jacques Lucke approved these changes 2023-10-04 13:50:52 +02:00
Jacques Lucke commented 2023-10-04 13:54:56 +02:00
Member
Copy Link

Looks good. Since this is a bug fix, it should go into the blender-v4.0-release branch. However, currently this patch is set to be merged into main. Updating the patch for that involves two steps:

  • Rebase your patch on blender-v4.0-release.
  • Change the target branch of the pull request (you can do that when clicking the edit button next to the title).

See this for more details about the release branch.

If that's too complex for you for now, I can also just commit this patch manually in the release branch, but might be a helpful learning experience for you to update the patch.

Looks good. Since this is a bug fix, it should go into the `blender-v4.0-release` branch. However, currently this patch is set to be merged into `main`. Updating the patch for that involves two steps: * Rebase your patch on `blender-v4.0-release`. * Change the target branch of the pull request (you can do that when clicking the edit button next to the title). See [this](https://wiki.blender.org/wiki/Process/Release_Cycle) for more details about the release branch. If that's too complex for you for now, I can also just commit this patch manually in the release branch, but might be a helpful learning experience for you to update the patch.
Vasilis-Milios force-pushed fix-issue-113194 from 8686dba17f to 7c4700591b 2023-10-04 14:15:50 +02:00 Compare
Vasilis-Milios changed title from Fix #113194: show the single value for sockets of type field to Fix #113194: show the single value for sockets of type field 2023-10-04 14:18:05 +02:00
Vasilis-Milios changed target branch from main to blender-v4.0-release 2023-10-04 14:18:07 +02:00
Vasilis-Milios commented 2023-10-04 14:20:19 +02:00
Author
Contributor
Copy Link

I am not sure I did it correctly.
Lots of file changes and commits I think😓.

I am not sure I did it correctly. Lots of file changes and commits I think😓.
Jacques Lucke commented 2023-10-04 14:25:30 +02:00
Member
Copy Link

It looks like the pull request now also tries to merge everything from main into the release branch, so it's indeed not quite right..

It looks like the pull request now also tries to merge everything from `main` into the release branch, so it's indeed not quite right..
Vasilis-Milios force-pushed fix-issue-113194 from 7c4700591b to 5c7860cb2d 2023-10-04 14:26:54 +02:00 Compare
Vasilis-Milios commented 2023-10-04 14:30:12 +02:00
Author
Contributor
Copy Link

Damnit 😠 .
Sorry haven't done this before. Will fix.

Damnit 😠 . Sorry haven't done this before. Will fix.
Jacques Lucke commented 2023-10-04 14:31:19 +02:00
Member
Copy Link

No worries, just try until it works and make sure you learn something along the way :)

No worries, just try until it works and make sure you learn something along the way :)
Vasilis-Milios force-pushed fix-issue-113194 from 5c7860cb2d to f2945bd4be 2023-10-04 14:57:13 +02:00 Compare
Vasilis-Milios commented 2023-10-04 15:01:13 +02:00
Author
Contributor
Copy Link

Couldn't think of a way to save the branch 😅 .
So deleted it, checked out from v4.0-release and applied the changes there.
Hope that's what you meant.

Couldn't think of a way to save the branch 😅 . So deleted it, checked out from v4.0-release and applied the changes there. Hope that's what you meant.
Jacques Lucke commented 2023-10-04 15:05:18 +02:00
Member
Copy Link

Yes thanks. Sorry for the back and forth. I will it merge in a moment because I'll have to fix the merge conflict when merging this into main afterwards.

Yes thanks. Sorry for the back and forth. I will it merge in a moment because I'll have to fix the merge conflict when merging this into `main` afterwards.
Vasilis-Milios commented 2023-10-04 15:13:21 +02:00
Author
Contributor
Copy Link

No worries.
That was fun :D.
If you need any help with any other simple tickets, feel free to cc me.

No worries. That was fun :D. If you need any help with any other simple tickets, feel free to cc me.
Jacques Lucke merged commit 6d1c5790d5 into blender-v4.0-release 2023-10-04 19:21:15 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Dalai Felinto
Jacques Lucke
Labels
Clear labels   
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
This issue affects/is about backward or forward 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
Issues relating to Wayland windowing support.

  
Interest
Workbench

  
Interest: X11

Issues relating to Xorg/X11 support.

  
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
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
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 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
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Nodes & Physics
Assignees
Clear assignees
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#113244
No description provided.
Delete Branch "Vasilis-Milios/blender:fix-issue-113194"

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?