[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46415] branches/tile/source/blender/ compositor/operations: TileBranch

[Jeroen Bakker]

Revision: 46415
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46415
Author:   jbakker
Date:     2012-05-08 11:15:09 +0000 (Tue, 08 May 2012)
Log Message:
-----------
TileBranch
 * delete when finished

Modified Paths:
--------------
    branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.h

Modified: branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.cpp	2012-05-08 10:53:59 UTC (rev 46414)
+++ branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.cpp	2012-05-08 11:15:09 UTC (rev 46415)
@@ -34,6 +34,8 @@
 	this->inputProgram = NULL;
 	this->data = NULL;
 	this->size = 1.0f;
+	this->deleteDataWhenFinished = false;
+	
 
 }
 void BlurBaseOperation::initExecution() {
@@ -86,4 +88,8 @@
 
 void BlurBaseOperation::deinitExecution() {
 	this->inputProgram = NULL;
+	if (deleteDataWhenFinished) {
+		delete data;
+	}
+	this->data = NULL;
 }

Modified: branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.h
===================================================================
--- branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.h	2012-05-08 10:53:59 UTC (rev 46414)
+++ branches/tile/source/blender/compositor/operations/COM_BlurBaseOperation.h	2012-05-08 11:15:09 UTC (rev 46415)
@@ -37,6 +37,7 @@
 	BlurBaseOperation();
 	float* make_gausstab(int rad);
 	float size;
+	bool deleteDataWhenFinished;
 
 public:
 	/**
@@ -52,5 +53,7 @@
 	void setData(NodeBlurData* data) {this->data= data;}
 	
 	void setSize(float size) {this->size = size;}
+	
+	void deleteDataWhenFinished() {this->deleteDataWhenFinished = true;}
 };
 #endif