[Bf-blender-cvs] [2bc1dcdb1a9] temp-collection-assets: Rename dimensions ID-property
Julian Eisel
noreply at git.blender.org
Tue Jan 18 14:24:39 CET 2022
Commit: 2bc1dcdb1a9b98724100002de1c79b71d6826ca9
Author: Julian Eisel
Date: Tue Jan 18 14:24:21 2022 +0100
Branches: temp-collection-assets
https://developer.blender.org/rB2bc1dcdb1a9b98724100002de1c79b71d6826ca9
Rename dimensions ID-property
===================================================================
M source/blender/blenkernel/intern/collection.c
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 762a9465097..619d6d55515 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -381,7 +381,9 @@ static IDProperty *collection_asset_dimensions_property(Collection *collection)
idprop.array.len = ARRAY_SIZE(dimensions);
idprop.array.type = IDP_FLOAT;
- IDProperty *property = IDP_New(IDP_ARRAY, &idprop, "dimensions");
+ /* Note that since the dimensions are more of an approximation (e.g. excluding instances), this
+ * is really just a hint for visual feedback! */
+ IDProperty *property = IDP_New(IDP_ARRAY, &idprop, "dimensions_hint");
memcpy(IDP_Array(property), dimensions, sizeof(dimensions));
return property;
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c
index be4d45e03a0..89cc7560044 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -566,7 +566,7 @@ static void view3d_boundbox_drop_draw_activate_collection(struct wmDropBox *drop
}
else {
struct AssetMetaData *meta_data = WM_drag_get_asset_meta_data(drag, drag_id_type);
- IDProperty *dimensions_prop = BKE_asset_metadata_idprop_find(meta_data, "dimensions");
+ IDProperty *dimensions_prop = BKE_asset_metadata_idprop_find(meta_data, "dimensions_hint");
if (dimensions_prop) {
copy_v3_v3(dimensions, IDP_Array(dimensions_prop));
}
More information about the Bf-blender-cvs
mailing list