Removed the DNA storage for LGG lift and inverse gamma in the color balance node...
authorLukas Toenne <lukas.toenne@googlemail.com>
Wed, 6 Nov 2013 12:44:49 +0000 (12:44 +0000)
committerLukas Toenne <lukas.toenne@googlemail.com>
Wed, 6 Nov 2013 12:44:49 +0000 (12:44 +0000)
source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
source/blender/makesdna/DNA_node_types.h

index 5578fdae54ec13336399c0488e04ab6f5ef12bcd..68829940da5b7cfc6c5f1a888a0adbb6628cc28b 100644 (file)
@@ -43,18 +43,16 @@ void ColorBalanceNode::convertToOperations(ExecutionSystem *graph, CompositorCon
        NodeOperation *operation;
        if (node->custom1 == 0) {
                ColorBalanceLGGOperation *operationLGG = new ColorBalanceLGGOperation();
-               {
-                       int c;
-       
-                       for (c = 0; c < 3; c++) {
-                               n->lift_lgg[c] = 2.0f - n->lift[c];
-                               n->gamma_inv[c] = (n->gamma[c] != 0.0f) ? 1.0f / n->gamma[c] : 1000000.0f;
-                       }
+
+               float lift_lgg[3], gamma_inv[3];
+               for (int c = 0; c < 3; c++) {
+                       lift_lgg[c] = 2.0f - n->lift[c];
+                       gamma_inv[c] = (n->gamma[c] != 0.0f) ? 1.0f / n->gamma[c] : 1000000.0f;
                }
-       
+
                operationLGG->setGain(n->gain);
-               operationLGG->setLift(n->lift_lgg);
-               operationLGG->setGammaInv(n->gamma_inv);
+               operationLGG->setLift(lift_lgg);
+               operationLGG->setGammaInv(gamma_inv);
                operation = operationLGG;
        }
        else {
index 451dd20daa633b321bbf7610da621cf16fadc90f..4ce4f6010b66b578e761fc9b57b6e124a1ae3328 100644 (file)
@@ -686,10 +686,6 @@ typedef struct NodeColorBalance {
        float lift[3];
        float gamma[3];
        float gain[3];
-
-       /* temp storage for inverted lift */
-       float lift_lgg[3];
-       float gamma_inv[3];
 } NodeColorBalance;
 
 typedef struct NodeColorspill {