From 80791c697212e11e5db402cb208de47dfe199f0d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 2 Jun 2015 09:18:19 +0000
Subject: [PATCH] Changed name of UniformCallback to UniformBufferCallback to
 avoid conflict with changes to come to the osg::Uniform::Callback ->
 osg::UniformCallback.

git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14884 16af8721-9629-0410-8352-f15c8da7e697
---
 examples/osguniformbuffer/osguniformbuffer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/osguniformbuffer/osguniformbuffer.cpp b/examples/osguniformbuffer/osguniformbuffer.cpp
index 06d2b85b3..e245a3d3c 100644
--- a/examples/osguniformbuffer/osguniformbuffer.cpp
+++ b/examples/osguniformbuffer/osguniformbuffer.cpp
@@ -98,7 +98,7 @@ char fragmentShaderSource[] =
 
 // Callback for animating the WarmColor
 
-class UniformCallback : public StateAttributeCallback
+class UniformBufferCallback : public StateAttributeCallback
 {
 public:
     void operator() (StateAttribute* attr, NodeVisitor* nv)
@@ -196,7 +196,7 @@ int main(int argc, char** argv)
     scene->addChild(group3);    
     ref_ptr<UniformBufferBinding> ubb3
         = new UniformBufferBinding(0, ubo3.get(), 0, blockSize);
-    ubb3->setUpdateCallback(new UniformCallback);
+    ubb3->setUpdateCallback(new UniformBufferCallback);
     ubb3->setDataVariance(Object::DYNAMIC);
     ss3->setAttributeAndModes(ubb3.get(), StateAttribute::ON);