Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-07-15 11:23:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-15 11:29:01 +0300
commit8e8a6b80cf2749d176d14eaa3bbfd0eccc9ec75e (patch)
tree7448ea0f5b8ab12f90d6d3201eab05f3618f674d /source/blender/io
parenta63a0ee24bf05346399a16f42d92747e1cf6a815 (diff)
Cleanup: replace BLI_assert(!"text") with BLI_assert_msg(0, "text")
This shows the text as part of the assertion message.
Diffstat (limited to 'source/blender/io')
-rw-r--r--source/blender/io/alembic/exporter/abc_custom_props.cc2
-rw-r--r--source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc2
-rw-r--r--source/blender/io/alembic/exporter/abc_writer_instance.cc2
-rw-r--r--source/blender/io/usd/intern/usd_hierarchy_iterator.cc2
-rw-r--r--source/blender/io/usd/intern/usd_writer_abstract.cc2
-rw-r--r--source/blender/io/usd/intern/usd_writer_camera.cc2
-rw-r--r--source/blender/io/usd/intern/usd_writer_light.cc2
7 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/io/alembic/exporter/abc_custom_props.cc b/source/blender/io/alembic/exporter/abc_custom_props.cc
index f5593e7ee30..4ea2fd03fff 100644
--- a/source/blender/io/alembic/exporter/abc_custom_props.cc
+++ b/source/blender/io/alembic/exporter/abc_custom_props.cc
@@ -141,7 +141,7 @@ void CustomPropertiesExporter::write_idparray(const IDProperty *idp_array)
continue;
}
std::cerr << "Custom property " << idp_array->name << " has elements of varying type";
- BLI_assert(!"Mixed type IDP_ARRAY custom property found");
+ BLI_assert_msg(0, "Mixed type IDP_ARRAY custom property found");
}
#endif
diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
index e2be241c144..174b2abb90f 100644
--- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
+++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
@@ -229,7 +229,7 @@ ABCAbstractWriter *ABCHierarchyIterator::create_data_writer_for_object_type(
case OB_GPENCIL:
return nullptr;
case OB_TYPE_MAX:
- BLI_assert(!"OB_TYPE_MAX should not be used");
+ BLI_assert_msg(0, "OB_TYPE_MAX should not be used");
return nullptr;
}
diff --git a/source/blender/io/alembic/exporter/abc_writer_instance.cc b/source/blender/io/alembic/exporter/abc_writer_instance.cc
index 1737e8c091e..353705f2c1d 100644
--- a/source/blender/io/alembic/exporter/abc_writer_instance.cc
+++ b/source/blender/io/alembic/exporter/abc_writer_instance.cc
@@ -59,7 +59,7 @@ Alembic::Abc::OCompoundProperty ABCInstanceWriter::abc_prop_for_custom_props()
OObject ABCInstanceWriter::get_alembic_object() const
{
/* There is no OObject for an instance. */
- BLI_assert(!"ABCInstanceWriter cannot return its Alembic OObject");
+ BLI_assert_msg(0, "ABCInstanceWriter cannot return its Alembic OObject");
return OObject();
}
diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
index 66dfc21441e..a9cba7f36d9 100644
--- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc
@@ -121,7 +121,7 @@ AbstractHierarchyWriter *USDHierarchyIterator::create_data_writer(const Hierarch
case OB_GPENCIL:
return nullptr;
case OB_TYPE_MAX:
- BLI_assert(!"OB_TYPE_MAX should not be used");
+ BLI_assert_msg(0, "OB_TYPE_MAX should not be used");
return nullptr;
}
diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc
index 5e66136abf1..6965ecf6249 100644
--- a/source/blender/io/usd/intern/usd_writer_abstract.cc
+++ b/source/blender/io/usd/intern/usd_writer_abstract.cc
@@ -128,7 +128,7 @@ bool USDAbstractWriter::mark_as_instance(const HierarchyContext &context, const
if (context.export_path == context.original_export_path) {
printf("USD ref error: export path is reference path: %s\n", context.export_path.c_str());
- BLI_assert(!"USD reference error");
+ BLI_assert_msg(0, "USD reference error");
return false;
}
diff --git a/source/blender/io/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc
index 677be9a7fc4..50d644241df 100644
--- a/source/blender/io/usd/intern/usd_writer_camera.cc
+++ b/source/blender/io/usd/intern/usd_writer_camera.cc
@@ -61,7 +61,7 @@ static void camera_sensor_size_for_render(const Camera *camera,
*r_sensor_y = camera->sensor_y;
break;
case CAMERA_SENSOR_FIT_AUTO:
- BLI_assert(!"Camera fit should be either horizontal or vertical");
+ BLI_assert_msg(0, "Camera fit should be either horizontal or vertical");
break;
}
}
diff --git a/source/blender/io/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc
index f77c51c22ec..7ffae1dd398 100644
--- a/source/blender/io/usd/intern/usd_writer_light.cc
+++ b/source/blender/io/usd/intern/usd_writer_light.cc
@@ -87,7 +87,7 @@ void USDLightWriter::do_write(HierarchyContext &context)
usd_light = pxr::UsdLuxDistantLight::Define(stage, usd_path);
break;
default:
- BLI_assert(!"is_supported() returned true for unsupported light type");
+ BLI_assert_msg(0, "is_supported() returned true for unsupported light type");
}
/* Scale factor to get to somewhat-similar illumination. Since the USDViewer had similar