Commit: fccc8a03fc52e0f88cf6c48acd2b06f677a4e867
Author: Jacques Lucke
Date: Thu Jul 7 19:27:30 2022 +0200
Branches: gpencil-new-data-proposal
https://developer.blender.org/rBfccc8a03fc52e0f88cf6c48acd2b06f677a4e867
Cleanup: improve asserts in generic span
===================================================================
M source/blender/blenlib/BLI_generic_span.hh
===================================================================
diff --git a/source/blender/blenlib/BLI_generic_span.hh
b/source/blender/blenlib/BLI_generic_span.hh
index 0a40201634a..143ab235d2e 100644
--- a/source/blender/blenlib/BLI_generic_span.hh
+++ b/source/blender/blenlib/BLI_generic_span.hh
@@ -28,7 +28,8 @@ class GSpan {
{
BLI_assert(size >= 0);
BLI_assert(buffer != nullptr || size == 0);
- BLI_assert(type->pointer_has_valid_alignment(buffer));
+ BLI_assert(size == 0 || type != nullptr);
+ BLI_assert(type == nullptr || type->pointer_has_valid_alignment(buffer));
}
GSpan(const CPPType &type, const void *buffer, int64_t size) : GSpan(&type,
buffer, size)
@@ -119,7 +120,8 @@ class GMutableSpan {
{
BLI_assert(size >= 0);
BLI_assert(buffer != nullptr || size == 0);
- BLI_assert(type->pointer_has_valid_alignment(buffer));
+ BLI_assert(size == 0 || type != nullptr);
+ BLI_assert(type == nullptr || type->pointer_has_valid_alignment(buffer));
}
GMutableSpan(const CPPType &type, void *buffer, int64_t size) :
GMutableSpan(&type, buffer, size)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
