Changeset 4612 for nanovis/branches/1.1/Volume.h

Timestamp:

Aug 2, 2014, 11:06:20 AM (10 years ago)

Author:

ldelgass

Message:

merge r3597 from trunk

Location:

nanovis/branches/1.1

Files:

• . (modified) (1 prop)
• Volume.h (modified) (2 diffs)

nanovis/branches/1.1/Volume.h

@@ -277 +277 @@
     TransferFunction *transferFunction()
     {
-        return _tfPtr;
-    }
-
-    void transferFunction(TransferFunction *tfPtr)
-    {
-        _tfPtr = tfPtr;
+        return _transferFunc;
+    }
+
+    void transferFunction(TransferFunction *transferFunc)
+    {
+        _transferFunc = transferFunc;
     }
 
@@ -366 +366 @@
      * render this volume.
      */
-    TransferFunction *_tfPtr;
+    TransferFunction *_transferFunc;
 
     float _ambient;      ///< Ambient material coefficient