Readfile: Make 'alloc name' for ID type automatically generated. #117958
No reviewers
Labels
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
2 Participants
Notifications
Due Date
No due date set.
Dependencies
No dependencies set.
Reference: blender/blender#117958
Loading…
Reference in New Issue
No description provided.
Delete Branch "mont29/blender:tmp-readfile-automatic-alloc-name"
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?
Avoids having yet another
switch
case over all ID types.Note that we could also add a string to the IDTypeInfo, but imho this is
a bit too limited in scope/interest to expose this outside of the readfile
code.
Mostly asking for validation of this 'fancy' piece of Cpp code (and to be sure it does not violates our guidelines)
Overall seems like an improvement, just one comment about the handling of invalid indices inline.
@ -2487,2 +2406,2 @@
}
return "Data from Lib Block";
static const std::array<std::string, INDEX_ID_MAX> id_alloc_names = [] {
auto n = decltype(id_alloc_names){};
Initialization with
{}
should be unnecessary here, for two reasons:Actually, I either need the
{}
, or the()
(which are both equivalent to an explicit call to the default constructor, if I'm correct?). Otherwise I get theerror: expected primary-expression before ‘decltype’
.@ -2489,0 +2411,4 @@
n[size_t(idtype_index)] = std::string("Data from '") + idtype_info->name + "'";
}
else {
n[size_t(idtype_index)] = "Data from UNKNWOWN ID Type";
Not sure about the handling of unkown id types here. Wouldn't you expect all the indices between
0
andINDEX_ID_MAX
to return a non-nullIDTypeInfo
? (if not, ignore this comment!). An invalid index will result in an out of bounds read ofid_alloc_names
rather than the defaultreturn
from before this commit.Maybe it's better to just turn that into an assert though.
The
INDEX_ID_NULL
enum value will always return null... But indeed we can be more explicit about it here, and assert for the other indices.And good point for the handling of 'unknown'/invalid indices, this has to be dealt with properly too.
@blender-bot build
@blender-bot build
@ -2487,0 +2420,4 @@
return n;
}();
const size_t idtype_index(size_t(BKE_idtype_idcode_to_index(id_code)));
I think
const int idtype_index = BKE_idtype_idcode_to_index(id_code);
is clearer. There's no need to cast explicitly here.Also might as well throw a
LIKELY
in the if statement, even just to show that's the expected code path.