[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47955] trunk/blender/source/blender/ compositor: fix for other uninitialized values for the split viewer node as well as incorrect frees for gaussian blue nodes .

[Campbell Barton]

Revision: 47955
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47955
Author:   campbellbarton
Date:     2012-06-15 13:56:54 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
fix for other uninitialized values for the split viewer node as well as 
incorrect frees for gaussian blue nodes.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
    
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp       
2012-06-15 13:40:17 UTC (rev 47954)
+++ trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp       
2012-06-15 13:56:54 UTC (rev 47955)
@@ -38,11 +38,19 @@
        ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
        if (image1Socket->isConnected() && image2Socket->isConnected()) {
                SplitViewerOperation *splitViewerOperation = new 
SplitViewerOperation();
+               
splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag 
& R_COLOR_MANAGEMENT);
+               
splitViewerOperation->setColorPredivide(context->getScene()->r.color_mgt_flag & 
R_COLOR_MANAGEMENT_PREDIVIDE);
                splitViewerOperation->setImage(image);
                splitViewerOperation->setImageUser(imageUser);
                splitViewerOperation->setActive((this->getbNode()->flag & 
NODE_DO_OUTPUT) && this->isInActiveGroup());
+               
splitViewerOperation->setSplitPercentage(this->getbNode()->custom1);
+
+               /* defaults - the viewer node has these options but not exposed 
for split view
+                * we could use the split to define an area of interest on one 
axis at least */
                
splitViewerOperation->setChunkOrder(COM_ORDER_OF_CHUNKS_DEFAULT);
-               
splitViewerOperation->setSplitPercentage(this->getbNode()->custom1);
+               splitViewerOperation->setCenterX(0.5f);
+               splitViewerOperation->setCenterY(0.5f);
+
                splitViewerOperation->setXSplit(!this->getbNode()->custom2);
                
image1Socket->relinkConnections(splitViewerOperation->getInputSocket(0), 0, 
graph);
                
image2Socket->relinkConnections(splitViewerOperation->getInputSocket(1), 1, 
graph);

Modified: 
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
===================================================================
--- 
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
       2012-06-15 13:40:17 UTC (rev 47954)
+++ 
trunk/blender/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
       2012-06-15 13:56:54 UTC (rev 47955)
@@ -152,7 +152,7 @@
 void GaussianBokehBlurOperation::deinitExecution()
 {
        BlurBaseOperation::deinitExecution();
-       delete this->gausstab;
+       delete [] this->gausstab;
        this->gausstab = NULL;
 }
 

Modified: 
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
--- 
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
   2012-06-15 13:40:17 UTC (rev 47954)
+++ 
trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
   2012-06-15 13:56:54 UTC (rev 47955)
@@ -110,7 +110,7 @@
 void GaussianXBlurOperation::deinitExecution()
 {
        BlurBaseOperation::deinitExecution();
-       delete this->gausstab;
+       delete [] this->gausstab;
        this->gausstab = NULL;
 }
 

Modified: 
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
--- 
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
   2012-06-15 13:40:17 UTC (rev 47954)
+++ 
trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
   2012-06-15 13:56:54 UTC (rev 47955)
@@ -105,7 +105,7 @@
 void GaussianYBlurOperation::deinitExecution()
 {
        BlurBaseOperation::deinitExecution();
-       delete this->gausstab;
+       delete [] this->gausstab;
        this->gausstab = NULL;
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs