Merge branch 'blender-v4.5-release'

2025-07-10 18:00:04 +02:00
parent 94e9203713 44faabdedd
commit b5ca00a403
2 changed files with 6 additions and 1 deletions
--- a/source/blender/draw/intern/draw_shader_shared.hh
+++ b/source/blender/draw/intern/draw_shader_shared.hh
@@ -154,7 +154,10 @@ enum eObjectInfoFlag : uint32_t {
  /* Avoid skipped info to change culling. */
  OBJECT_NO_INFO = ~OBJECT_HOLDOUT
 };
+
+#if !defined(GPU_SHADER) && defined(__cplusplus)
 ENUM_OPERATORS(eObjectInfoFlag, OBJECT_ACTIVE_EDIT_MODE);
+#endif

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