Merge branch 'blender-v4.5-release'

2025-07-10 16:59:50 +02:00
parent b0d7e6d15f 58a81f5c3a
commit 41746ddd3f
2 changed files with 1 additions and 2 deletions
--- a/source/blender/draw/intern/draw_resource.hh
+++ b/source/blender/draw/intern/draw_resource.hh
@@ -60,8 +60,6 @@ inline std::ostream &operator<<(std::ostream &stream, const ObjectMatrices &matr
 /** \name ObjectInfos
 * \{ */

-ENUM_OPERATORS(eObjectInfoFlag, OBJECT_NEGATIVE_SCALE)
-
 inline void ObjectInfos::sync()
 {
  object_attrs_len = 0;
--- a/source/blender/draw/intern/draw_shader_shared.hh
+++ b/source/blender/draw/intern/draw_shader_shared.hh
@@ -154,6 +154,7 @@ enum eObjectInfoFlag : uint32_t {
  /* Avoid skipped info to change culling. */
  OBJECT_NO_INFO = ~OBJECT_HOLDOUT
 };
+ENUM_OPERATORS(eObjectInfoFlag, OBJECT_ACTIVE_EDIT_MODE);

 struct ObjectInfos {
  /** Uploaded as center + size. Converted to mul+bias to local coord. */