[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37507] trunk/blender/source/blender/imbuf /intern/openexr/openexr_api.cpp: fix for openexr include path, for both cmake and scons a custom openexr install wouldn' t work since it expected BF_OPENEXR/include and BF_OPENEXR/include/ OpenEXR to be in the search path.

Campbell Barton ideasman42 at gmail.com
Wed Jun 15 13:50:45 CEST 2011


Revision: 37507
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37507
Author:   campbellbarton
Date:     2011-06-15 11:50:45 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
fix for openexr include path, for both cmake and scons a custom openexr install wouldn't work since it expected BF_OPENEXR/include and BF_OPENEXR/include/OpenEXR to be in the search path.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2011-06-15 11:41:15 UTC (rev 37506)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp	2011-06-15 11:50:45 UTC (rev 37507)
@@ -76,18 +76,18 @@
 #include <IlmImf/ImfStringAttribute.h>
 #include <Imath/ImathBox.h>
 #else
-#include <OpenEXR/half.h>
-#include <OpenEXR/ImfVersion.h>
-#include <OpenEXR/ImathBox.h>
-#include <OpenEXR/ImfArray.h>
-#include <OpenEXR/ImfIO.h>
-#include <OpenEXR/ImfChannelList.h>
-#include <OpenEXR/ImfPixelType.h>
-#include <OpenEXR/ImfInputFile.h>
-#include <OpenEXR/ImfOutputFile.h>
-#include <OpenEXR/ImfCompression.h>
-#include <OpenEXR/ImfCompressionAttribute.h>
-#include <OpenEXR/ImfStringAttribute.h>
+#include <half.h>
+#include <ImfVersion.h>
+#include <ImathBox.h>
+#include <ImfArray.h>
+#include <ImfIO.h>
+#include <ImfChannelList.h>
+#include <ImfPixelType.h>
+#include <ImfInputFile.h>
+#include <ImfOutputFile.h>
+#include <ImfCompression.h>
+#include <ImfCompressionAttribute.h>
+#include <ImfStringAttribute.h>
 #endif
 
 using namespace Imf;




More information about the Bf-blender-cvs mailing list