Fix #98923 : Remove the ability to offset a linked collection asset not instantiated #104958
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#104958
Loading…
Reference in New Issue
No description provided.
Delete Branch "Kdaf/blender:fix-98923-collection-asset-instance-offset_"
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?
When the user is linking a collection asset, there is actually two options : use_instance or not. When not instantiating the collection, the user should not be able to offset its content (because linked).
@ -1860,0 +1863,4 @@
wmOperator *op,
const PropertyRNA *prop)
{
if (RNA_boolean_get(op->ptr, "use_instance"))
Style: Always use braces https://wiki.blender.org/wiki/Style_Guide/C_Cpp#Braces
@ -1860,0 +1866,4 @@
if (RNA_boolean_get(op->ptr, "use_instance"))
return true;
const char *prop_name = RNA_property_ui_name(prop);
This shouldn't use the UI name but the internal identifier, see
RNA_property_identifier()
. UI names are supposed to be changeable without compatibility concerns, plus they are translated. For example this code will break for languages that have "Rotation" or "Location" translated.@ -1860,0 +1870,4 @@
if (STR_ELEM(prop_name, "Location", "Rotation")) {
Collection *collection = static_cast<Collection *>(
BLI_findlink(&CTX_data_main(C)->collections, RNA_enum_get(op->ptr, "collection")));
This is not in sync with how
collection_drop_exec()
gets the collection, that first attempts to get the collection from the session UUID and the name, seecollection_add_info_get_from_op()
.@ -1860,0 +1871,4 @@
if (STR_ELEM(prop_name, "Location", "Rotation")) {
Collection *collection = static_cast<Collection *>(
BLI_findlink(&CTX_data_main(C)->collections, RNA_enum_get(op->ptr, "collection")));
if (!ID_IS_LINKED(&collection->id))
I'd omit the negation to make this more readable / less error-prone:
Checkout
From your project repository, check out a new branch and test the changes.