Commit: bb530a77b638d1ccab779e1f43675030597f995e
Author: Clément Foucault
Date: Wed Aug 26 20:09:32 2020 +0200
Branches: master
https://developer.blender.org/rBbb530a77b638d1ccab779e1f43675030597f995e
BLI_utildefines: Fix assignment in binary ops for ENUM_OPERATORS
That was an overlook from the review when we introduced it.
===================================================================
M source/blender/blenlib/BLI_utildefines.h
===================================================================
diff --git a/source/blender/blenlib/BLI_utildefines.h
b/source/blender/blenlib/BLI_utildefines.h
index 2699f2498ac..acfa77ecf31 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -765,15 +765,15 @@ extern bool BLI_memory_is_zero(const void *arr, const
size_t arr_size);
# define ENUM_OPERATORS(_enum_type) \
inline constexpr _enum_type operator|(_enum_type a, _enum_type b) \
{ \
- return a = static_cast<_enum_type>(static_cast<int>(a) | b); \
+ return static_cast<_enum_type>(static_cast<int>(a) | b); \
} \
inline constexpr _enum_type operator&(_enum_type a, _enum_type b) \
{ \
- return a = static_cast<_enum_type>(static_cast<int>(a) & b); \
+ return static_cast<_enum_type>(static_cast<int>(a) & b); \
} \
inline constexpr _enum_type operator~(_enum_type a) \
{ \
- return a = static_cast<_enum_type>(~static_cast<int>(a)); \
+ return static_cast<_enum_type>(~static_cast<int>(a)); \
} \
inline _enum_type &operator|=(_enum_type &a, _enum_type b) \
{ \
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
