inverted macro so OCIO support is enabled by default

2019-03-11 02:45:02 +11:00
parent 938224214c
commit a800904580
11 changed files with 188 additions and 162 deletions
@@ -72,9 +72,18 @@ private:
  void delete_buffers();
  void delete_shaders();

+#ifndef NO_OCIO
+  // OpenColorIO functions
  void set_up_ocio();
  void destroy_ocio();

+  // OpenColorIO variables
+  float ocio_lut_data[OCIO_NUM_3D_ENTRIES];
+  GLuint ocio_lut_texture;
+  QOpenGLShaderProgram* ocio_shader;
+  QString ocio_loaded_config;
+#endif
+
  FramebufferObject front_buffer_1;
  QMutex front_mutex1;

@@ -97,12 +106,6 @@ private:
  FramebufferObject back_buffer_1;
  FramebufferObject back_buffer_2;

-  // OpenColorIO variables
-  float ocio_lut_data[OCIO_NUM_3D_ENTRIES];
-  GLuint ocio_lut_texture;
-  QOpenGLShaderProgram* ocio_shader;
-  QString ocio_loaded_config;
-
  SequencePtr seq;
  int divider;
  int tex_width;