From fd0d4987c97ada67180b3ecffa737e2fa6833c9c Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Fri, 21 Apr 2023 10:35:24 +0200 Subject: [PATCH 1/3] Fix #107186: Curve assets don't generate preview images e7bea3fb6ed0 disabled this. I do believe excluding `OB_CURVES_LEGACY` is wrong though. While it _might_ not have real geometry, it certainly _can_ have real geometry, so now legacy curves are enabled again in `OB_TYPE_IS_GEOMETRY`. A more elaborate check for real geo on legacy curves could be set up in a following commit. Since `OB_TYPE_IS_GEOMETRY` is also used in depsgraph driver handling, will seek additional review from more devs. --- source/blender/makesdna/DNA_object_types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f940c0e862c..ae2520f8caa 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -540,6 +540,7 @@ typedef enum ObjectType { OB_FONT, \ OB_MBALL, \ OB_GPENCIL_LEGACY, \ + OB_CURVES_LEGACY, \ OB_CURVES, \ OB_POINTCLOUD, \ OB_VOLUME)) -- 2.30.2 From 76673c6383eab7d4ee81ae75da207c9ccb8c8574 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Mon, 24 Apr 2023 13:17:12 +0200 Subject: [PATCH 2/3] clarify comment --- source/blender/makesdna/DNA_object_types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index ae2520f8caa..8a56c2287e7 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -532,7 +532,8 @@ typedef enum ObjectType { #define OB_TYPE_SUPPORT_MATERIAL(_type) \ (((_type) >= OB_MESH && (_type) <= OB_MBALL) || \ ((_type) >= OB_GPENCIL_LEGACY && (_type) <= OB_VOLUME)) -/** Does the object have some render-able geometry (unlike empties, cameras, etc.). */ +/** Does the object have some render-able geometry (unlike empties, cameras, etc.). Evaluates to + * true for #OB_CURVES_LEGACY, since these often evaluate to objects with geometry. */ #define OB_TYPE_IS_GEOMETRY(_type) \ (ELEM(_type, \ OB_MESH, \ -- 2.30.2 From f4198ad63eafd9b100f764bf2fe097718e599998 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Tue, 25 Apr 2023 10:35:23 +0200 Subject: [PATCH 3/3] improve english in comment --- source/blender/makesdna/DNA_object_types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 8a56c2287e7..53cd96c00ba 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -532,8 +532,8 @@ typedef enum ObjectType { #define OB_TYPE_SUPPORT_MATERIAL(_type) \ (((_type) >= OB_MESH && (_type) <= OB_MBALL) || \ ((_type) >= OB_GPENCIL_LEGACY && (_type) <= OB_VOLUME)) -/** Does the object have some render-able geometry (unlike empties, cameras, etc.). Evaluates to - * true for #OB_CURVES_LEGACY, since these often evaluate to objects with geometry. */ +/** Does the object have some render-able geometry (unlike empties, cameras, etc.). True for + * #OB_CURVES_LEGACY, since these often evaluate to objects with geometry. */ #define OB_TYPE_IS_GEOMETRY(_type) \ (ELEM(_type, \ OB_MESH, \ -- 2.30.2