blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix #99114: USD: Cache file operators now recognize USD as well as Alembic #118685

Merged
Brecht Van Lommel merged 2 commits from CharlesWardlaw/blender:bugfix/usd_cachefile_open into main 2024-03-25 14:51:11 +01:00
Conversation 2 Commits 2 Files Changed 1 +6 -6
Charles Wardlaw commented 2024-02-23 21:32:38 +01:00
Member
Copy Link

Addressing issue #99114

USD files are now findable from the cachefile.open() and cachefile.layer_add() operators. Removed the ".abc" appending when looking for a file for the first time, as it no longer makes sense.

Addressing issue https://projects.blender.org/blender/blender/issues/99114 USD files are now findable from the cachefile.open() and cachefile.layer_add() operators. Removed the ".abc" appending when looking for a file for the first time, as it no longer makes sense.
Charles Wardlaw requested review from Michael Kowalski 2024-02-23 21:33:01 +01:00
Charles Wardlaw added this to the USD project 2024-02-23 21:33:08 +01:00
Michael Kowalski approved these changes 2024-02-24 01:50:24 +01:00
Michael Kowalski left a comment
Member
Copy Link

This looks good! Thanks for the fix!

This looks good! Thanks for the fix!
Michael Kowalski requested review from Jesse Yurkovich 2024-02-24 01:50:46 +01:00
Michael Kowalski added the
Interest
USD
Interest
Pipeline, Assets & IO
 labels 2024-02-24 01:52:33 +01:00
Jesse Yurkovich approved these changes 2024-02-24 02:14:34 +01:00
Dismissed
Jesse Yurkovich left a comment
Member
Copy Link

Remember to target the blender-v4.1-release branch and fixup the Title before commit.

Looks good otherwise.

Remember to target the `blender-v4.1-release` branch and fixup the Title before commit. Looks good otherwise.
CharlesWardlaw changed target branch from main to blender-v4.1-release 2024-02-29 19:33:47 +01:00
Charles Wardlaw changed title from [bugfix] MeshSequenceCache and TransformCache file operators now recognize USD as well as Alembic. to Fix: USD: Cache file operators now recognize USD as well as Alembic 2024-02-29 19:35:30 +01:00
Charles Wardlaw force-pushed bugfix/usd_cachefile_open from c94b38287c to 7a3abe54dd 2024-02-29 20:10:21 +01:00 Compare
Charles Wardlaw changed title from Fix: USD: Cache file operators now recognize USD as well as Alembic to Fix #99114: USD: Cache file operators now recognize USD as well as Alembic 2024-02-29 20:17:36 +01:00
Bastien Montagne reviewed 2024-03-01 10:37:40 +01:00
source/blender/editors/io/io_cache.cc Outdated
@ -49,15 +49,6 @@ static void cachefile_init(bContext *C, wmOperator *op)
static int cachefile_open_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/)
{
if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
Bastien Montagne commented 2024-03-01 10:37:26 +01:00
Owner
Copy Link

I don't think that completely removing the pre-setting of a file path (or at least dir path) is a good thing here? IMHO, it should still be set to the current blendfile's directory if unset?

Same below in cachefile_layer_open_invoke.

I don't think that completely removing the pre-setting of a file path (or at least dir path) is a good thing here? IMHO, it should still be set to the current blendfile's directory if unset? Same below in `cachefile_layer_open_invoke`.
Charles Wardlaw commented 2024-03-18 20:19:57 +01:00
Author
Member
Copy Link

Brought them back, but removed appending the .abc file extension.

Brought them back, but removed appending the .abc file extension.
CharlesWardlaw marked this conversation as resolved
Jesse Yurkovich commented 2024-03-18 22:32:30 +01:00
Member
Copy Link

@blender-bot build

@blender-bot build
Jesse Yurkovich reviewed 2024-03-18 23:47:51 +01:00
source/blender/editors/io/io_cache.cc Outdated
@ -54,7 +54,6 @@ static int cachefile_open_invoke(bContext *C, wmOperator *op, const wmEvent * /*
Main *bmain = CTX_data_main(C);
STRNCPY(filepath, BKE_main_blendfile_path(bmain));
BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
Jesse Yurkovich commented 2024-03-18 23:47:51 +01:00
Member
Copy Link

With this change it's now possible to end up selecting the .blend file as a cache file because BKE_main_blendfile_path will return a path ending in .blend.

I think the intent of Bastien's comment was to just use the same directory so the following would be ok:

-    STRNCPY(filepath, BKE_main_blendfile_path(bmain));
-    BLI_path_extension_replace(filepath, sizeof(filepath), ".abc");
+    /* Default to the same directory as the blend file. */
+    BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath));
With this change it's now possible to end up selecting the .blend file as a cache file because `BKE_main_blendfile_path` will return a path ending in .blend. I think the intent of Bastien's comment was to just use the same directory so the following would be ok: ```diff - STRNCPY(filepath, BKE_main_blendfile_path(bmain)); - BLI_path_extension_replace(filepath, sizeof(filepath), ".abc"); + /* Default to the same directory as the blend file. */ + BLI_path_split_dir_part(BKE_main_blendfile_path(bmain), filepath, sizeof(filepath)); ```
deadpin marked this conversation as resolved
Charles Wardlaw force-pushed bugfix/usd_cachefile_open from ceb23fcf0b to f92cc5f4b0 2024-03-19 16:33:38 +01:00 Compare
Charles Wardlaw added 1 commit 2024-03-19 19:50:57 +01:00
Jesse Yurkovich approved these changes 2024-03-19 19:58:19 +01:00
Jesse Yurkovich left a comment
Member
Copy Link

Looks good and works fine now.

Looks good and works fine now.
Bastien Montagne reviewed 2024-03-20 08:06:11 +01:00
Bastien Montagne left a comment
Owner
Copy Link

Technically code LGTM now.

I cannot test right now though, and I think it's too late in 4.1 release cycle to merge it now? But maybe @deadpin or @brecht have a different opinion here.

Technically code LGTM now. I cannot test right now though, and I think it's too late in 4.1 release cycle to merge it now? But maybe @deadpin or @brecht have a different opinion here.
Brecht Van Lommel commented 2024-03-20 10:36:32 +01:00
Owner
Copy Link

It's not a high priority bug, so should not go to 4.1 at this point in the release cycle.

It's not a high priority bug, so should not go to 4.1 at this point in the release cycle.
brecht changed target branch from blender-v4.1-release to main 2024-03-25 14:49:43 +01:00
Brecht Van Lommel merged commit 23fab6b6a6 into main 2024-03-25 14:51:11 +01:00
Brecht Van Lommel deleted branch bugfix/usd_cachefile_open 2024-03-25 14:51:13 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
Michael Kowalski
Jesse Yurkovich
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
USD
Assignees
Clear assignees
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#118685
No description provided.
Delete Branch "CharlesWardlaw/blender:bugfix/usd_cachefile_open"

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?