[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50337] branches/soc-2011-tomato/source/ blender/imbuf/intern/colormanagement.c: Color Management: fix compilation error when OCIO is disabled

[Sergey Sharybin]

Revision: 50337
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50337
Author:   nazgul
Date:     2012-09-03 10:08:55 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Color Management: fix compilation error when OCIO is disabled

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c

Modified: branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-09-03 09:03:25 UTC (rev 50336)
+++ branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c	2012-09-03 10:08:55 UTC (rev 50337)
@@ -1331,6 +1331,7 @@
 void IMB_display_buffer_pixel(float result[4], const float pixel[4],  const ColorManagedViewSettings *view_settings,
                               const ColorManagedDisplaySettings *display_settings)
 {
+#ifdef WITH_OCIO
 	ConstProcessorRcPtr *processor;
 	const float gamma = view_settings->gamma;
 	const float exposure = view_settings->exposure;
@@ -1343,6 +1344,12 @@
 
 	if (processor)
 		OCIO_processorApplyRGBA(processor, result);
+#else
+	(void) view_settings;
+	(void) display_settings;
+
+	copy_v4_v4(result, pixel);
+#endif
 }
 
 void IMB_display_buffer_to_imbuf_rect(ImBuf *ibuf, const ColorManagedViewSettings *view_settings,