[Bf-blender-cvs] [49c0b9ec438] master: Assets/UI: Sanity check argument for UILayout.template_asset_view()

Julian Eisel noreply at git.blender.org
Thu Jul 29 17:35:12 CEST 2021


Commit: 49c0b9ec438249e579485276c989aa16de5166ef
Author: Julian Eisel
Date:   Thu Jul 29 17:14:52 2021 +0200
Branches: master
https://developer.blender.org/rB49c0b9ec438249e579485276c989aa16de5166ef

Assets/UI: Sanity check argument for UILayout.template_asset_view()

Was already doing some sanity checks, but wasn't checking if the passed
property actually is a collection property, which is important.

===================================================================

M	source/blender/editors/interface/interface_template_asset_view.cc

===================================================================

diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc
index fe2c660f2d0..5c94881bdbf 100644
--- a/source/blender/editors/interface/interface_template_asset_view.cc
+++ b/source/blender/editors/interface/interface_template_asset_view.cc
@@ -162,6 +162,10 @@ static void asset_view_template_refresh_asset_collection(
     RNA_warning("Asset collection not found");
     return;
   }
+  if (RNA_property_type(assets_prop) != PROP_COLLECTION) {
+    RNA_warning("Expected a collection property");
+    return;
+  }
   if (!RNA_struct_is_a(RNA_property_pointer_type(&assets_dataptr, assets_prop),
                        &RNA_AssetHandle)) {
     RNA_warning("Expected a collection property for AssetHandle items");



More information about the Bf-blender-cvs mailing list