Changed COLOUR to COLOR to be consistent with OpenGL spelling

2012-11-13 13:32:01 +00:00
parent 92975a01fd
commit 933baf5db4
6 changed files with 14 additions and 14 deletions
--- a/include/osg/ImageUtils
+++ b/include/osg/ImageUtils
@@ -163,9 +163,9 @@ extern OSG_EXPORT osg::Image* createSpotLightImage(const osg::Vec4& centerColour

 enum ColorSpaceOperation
 {
-    NO_COLOUR_SPACE_OPERATION,
+    NO_COLOR_SPACE_OPERATION,
    MODULATE_ALPHA_BY_LUMINANCE,
-    MODULATE_ALPHA_BY_COLOUR,
+    MODULATE_ALPHA_BY_COLOR,
    REPLACE_ALPHA_WITH_LUMINANCE,
    REPLACE_RGB_WITH_LUMINANCE
 };
--- a/include/osgPresentation/SlideShowConstructor
+++ b/include/osgPresentation/SlideShowConstructor
@@ -293,7 +293,7 @@ public:
            cutoffValue(0.1),
            sampleDensityValue(0.005),
            sampleDensityWhenMovingValue(0.0),
-            colorSpaceOperation(osg::NO_COLOUR_SPACE_OPERATION),
+            colorSpaceOperation(osg::NO_COLOR_SPACE_OPERATION),
            colorModulate(1.0f,1.0f,1.0f,1.0f)
        {
            region[0] = region[1] = region[2] = 0.0f;