[Bf-blender-cvs] [03c95635824] blender-v3.0-release: Fix T93431: Crash when empty is marked as asset
Pratik Borhade
noreply at git.blender.org
Mon Nov 29 15:31:18 CET 2021
Commit: 03c956358249851bdd8860b87b88985bd29044cf
Author: Pratik Borhade
Date: Mon Nov 29 15:24:44 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB03c956358249851bdd8860b87b88985bd29044cf
Fix T93431: Crash when empty is marked as asset
Make `ED_preview_id_is_supported(ID *)` NULL-safe. It's semantically
valid, as it's not possible to render a preview of a NULL ID.
The crash was introduced in 481f032f5cbe2cd3c36c9ef516670fd9e06db25f
Reviewed By: sybren, jbakker
Maniphest Tasks: T93431
Differential Revision: https://developer.blender.org/D13398
===================================================================
M source/blender/editors/render/render_preview.c
===================================================================
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 25353dc30fe..e60e5e52187 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1764,6 +1764,10 @@ static void icon_preview_free(void *customdata)
*/
bool ED_preview_id_is_supported(const ID *id)
{
+ if (id == NULL) {
+ return false;
+ }
+
if (GS(id->name) == ID_OB) {
return object_preview_is_type_supported((const Object *)id);
}
More information about the Bf-blender-cvs
mailing list