Fix: Adding node group asset doesn't respect import method #109706

Merged
Hans Goudey merged 3 commits from HooglyBoogly/blender:fix-asset-import-method into main 2023-07-11 14:18:18 +02:00
Member

The asset import method option was added after the additions that use
assets in the node editor, so the node editor features still always used
append and reuse, no matter the import method.

This commit improves the asset import function to use the asset's
import method, with "Append & Reuse" as a default.

The asset import method option was added after the additions that use assets in the node editor, so the node editor features still always used append and reuse, no matter the import method. This commit improves the asset import function to use the asset's import method, with "Append & Reuse" as a default.
Hans Goudey added 1 commit 2023-07-04 18:24:16 +02:00
buildbot/vexp-code-patch-coordinator Build done. Details
6a18ddd5ae
Fix: Adding node group asset doesn't respect import method
The asset import method option was added after the additions that use
assets in the node editor, so the node editor features still always used
append and reuse, no matter the import method.

This commit improves the asset import function to use the asset's
import method, with "Append & Reuse" as a default.
Hans Goudey requested review from Julian Eisel 2023-07-04 18:24:26 +02:00
Hans Goudey added this to the Pipeline, Assets & IO project 2023-07-04 18:24:31 +02:00
Author
Member

@blender-bot build

@blender-bot build
Julian Eisel approved these changes 2023-07-11 11:34:16 +02:00
@ -21,0 +23,4 @@
* If the asset already has a corresponding local #ID, return it. Otherwise, link or append the
* asset's data-block, using "Append & Reuse" if the method is unspecified.
*/
ID *ensure_asset_local_id(Main &bmain, const asset_system::AssetRepresentation &asset);
Member

I think the name should communicate that this may do the actual import, this is an important and potentially costly operation.

How about ensure_asset_id_imported(), get_asset_local_id_or_import() or something like that?

I think the name should communicate that this may do the actual import, this is an important and potentially costly operation. How about `ensure_asset_id_imported()`, `get_asset_local_id_or_import()` or something like that?
HooglyBoogly marked this conversation as resolved
Hans Goudey added 2 commits 2023-07-11 14:08:47 +02:00
Hans Goudey merged commit 2549272f02 into main 2023-07-11 14:18:18 +02:00
Hans Goudey deleted branch fix-asset-import-method 2023-07-11 14:18:20 +02: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 Assignees
2 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#109706
No description provided.