From 8e8a6b80cf2749d176d14eaa3bbfd0eccc9ec75e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 15 Jul 2021 18:23:28 +1000 Subject: Cleanup: replace BLI_assert(!"text") with BLI_assert_msg(0, "text") This shows the text as part of the assertion message. --- source/blender/makesrna/intern/rna_access.c | 4 ++-- source/blender/makesrna/intern/rna_access_compare_override.c | 2 +- source/blender/makesrna/intern/rna_define.c | 2 +- source/blender/makesrna/intern/rna_mask.c | 2 +- source/blender/makesrna/intern/rna_nodetree.c | 4 ++-- source/blender/makesrna/intern/rna_object_force.c | 5 +++-- source/blender/makesrna/intern/rna_space.c | 2 +- source/blender/makesrna/intern/rna_ui.c | 4 ++-- source/blender/makesrna/intern/rna_wm.c | 4 ++-- source/blender/makesrna/intern/rna_wm_gizmo.c | 6 +++--- 10 files changed, 18 insertions(+), 17 deletions(-) (limited to 'source/blender/makesrna/intern') diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index eb347987f87..0285ef44e17 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -5864,12 +5864,12 @@ ID *RNA_find_real_ID_and_path(Main *bmain, ID *id, const char **r_path) *r_path = "collection"; break; default: - BLI_assert(!"Missing handling of embedded id type."); + BLI_assert_msg(0, "Missing handling of embedded id type."); } } if (id_type->owner_get == NULL) { - BLI_assert(!"Missing handling of embedded id type."); + BLI_assert_msg(0, "Missing handling of embedded id type."); return id; } return id_type->owner_get(bmain, id); diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index c4d35140423..3912c873fd0 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -867,7 +867,7 @@ bool RNA_struct_override_matches(Main *bmain, else { /* Too noisy for now, this triggers on runtime props like transform matrices etc. */ #if 0 - BLI_assert(!"We have differences between reference and " + BLI_assert_msg(0, "We have differences between reference and " "overriding data on non-editable property."); #endif matching = false; diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 1a0d4ebb7e6..fadce9e3c89 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -52,7 +52,7 @@ static CLG_LogRef LOG = {"rna.define"}; # define ASSERT_SOFT_HARD_LIMITS \ if (softmin < hardmin || softmax > hardmax) { \ CLOG_ERROR(&LOG, "error with soft/hard limits: %s.%s", CONTAINER_RNA_ID(cont), identifier); \ - BLI_assert(!"invalid soft/hard limits"); \ + BLI_assert_msg(0, "invalid soft/hard limits"); \ } \ (void)0 #else diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index 896e253049b..8c7d9698a67 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -505,7 +505,7 @@ static void rna_MaskSpline_points_add(ID *id, MaskSpline *spline, int count) if (!layer) { /* Shall not happen actually */ - BLI_assert(!"No layer found for the spline"); + BLI_assert_msg(0, "No layer found for the spline"); return; } diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index cfd83a85d2e..4712f4a0a0b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4388,7 +4388,7 @@ static int point_density_particle_color_source_from_shader( case SHD_POINTDENSITY_COLOR_PARTVEL: return TEX_PD_COLOR_PARTVEL; default: - BLI_assert(!"Unknown color source"); + BLI_assert_msg(0, "Unknown color source"); return TEX_PD_COLOR_CONSTANT; } } @@ -4404,7 +4404,7 @@ static int point_density_vertex_color_source_from_shader( case SHD_POINTDENSITY_COLOR_VERTNOR: return TEX_PD_COLOR_VERTNOR; default: - BLI_assert(!"Unknown color source"); + BLI_assert_msg(0, "Unknown color source"); return TEX_PD_COLOR_CONSTANT; } } diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index f8a98eb1753..98d59bf3a1a 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -133,8 +133,9 @@ static bool rna_Cache_get_valid_owner_ID(PointerRNA *ptr, Object **ob, Scene **s *scene = (Scene *)ptr->owner_id; break; default: - BLI_assert(!"Trying to get PTCacheID from an invalid ID type " - "(Only scenes and objects are supported)."); + BLI_assert_msg(0, + "Trying to get PTCacheID from an invalid ID type " + "(Only scenes and objects are supported)."); break; } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 7366934695e..1d00c379b06 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2715,7 +2715,7 @@ static StructRNA *rna_FileBrowser_params_typef(PointerRNA *ptr) return &RNA_FileAssetSelectParams; } - BLI_assert(!"Could not identify file select parameters"); + BLI_assert_msg(0, "Could not identify file select parameters"); return NULL; } diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index d4ae5f1ecfc..849bbca16f4 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -1014,7 +1014,7 @@ static void rna_Panel_bl_description_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, RNA_DYN_DESCR_MAX); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_description on a non-builtin panel"); + BLI_assert_msg(0, "setting the bl_description on a non-builtin panel"); } } @@ -1026,7 +1026,7 @@ static void rna_Menu_bl_description_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, RNA_DYN_DESCR_MAX); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_description on a non-builtin menu"); + BLI_assert_msg(0, "setting the bl_description on a non-builtin menu"); } } diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index afbde26e59e..2a4abac04f8 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1765,7 +1765,7 @@ static void rna_Operator_bl_idname_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, OP_MAX_TYPENAME); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_idname on a non-builtin operator"); + BLI_assert_msg(0, "setting the bl_idname on a non-builtin operator"); } } @@ -1777,7 +1777,7 @@ static void rna_Operator_bl_label_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, OP_MAX_TYPENAME); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_label on a non-builtin operator"); + BLI_assert_msg(0, "setting the bl_label on a non-builtin operator"); } } diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 076a77d4fb5..6a1574f3dbe 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -244,7 +244,7 @@ static void rna_Gizmo_bl_idname_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, MAX_NAME); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_idname on a non-builtin operator"); + BLI_assert_msg(0, "setting the bl_idname on a non-builtin operator"); } } @@ -643,7 +643,7 @@ static void rna_GizmoGroup_bl_idname_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, MAX_NAME); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_idname on a non-builtin operator"); + BLI_assert_msg(0, "setting the bl_idname on a non-builtin operator"); } } @@ -655,7 +655,7 @@ static void rna_GizmoGroup_bl_label_set(PointerRNA *ptr, const char *value) BLI_strncpy(str, value, MAX_NAME); /* utf8 already ensured */ } else { - BLI_assert(!"setting the bl_label on a non-builtin operator"); + BLI_assert_msg(0, "setting the bl_label on a non-builtin operator"); } } -- cgit v1.2.3