[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45800] branches/tile/source/blender: TileBranch
Jeroen Bakker
j.bakker at atmind.nl
Fri Apr 20 10:23:49 CEST 2012
Revision: 45800
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45800
Author: jbakker
Date: 2012-04-20 08:23:49 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
TileBranch
* removed unneeded files
Modified Paths:
--------------
branches/tile/source/blender/blenkernel/intern/node.c
branches/tile/source/blender/compositor/CMakeLists.txt
branches/tile/source/blender/compositor/intern/COM_Converter.cpp
branches/tile/source/blender/nodes/composite/node_composite_tree.c
Removed Paths:
-------------
branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.cpp
branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.h
branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.cpp
branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.h
branches/tile/source/blender/compositor/nodes/COM_LensFlareNode.cpp
branches/tile/source/blender/compositor/nodes/COM_LensFlareNode.h
branches/tile/source/blender/compositor/nodes/COM_OpenCLTestNode.cpp
branches/tile/source/blender/compositor/nodes/COM_OpenCLTestNode.h
branches/tile/source/blender/compositor/operations/COM_OpenCLTestOperation.cpp
branches/tile/source/blender/compositor/operations/COM_OpenCLTestOperation.h
Modified: branches/tile/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/tile/source/blender/blenkernel/intern/node.c 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/blenkernel/intern/node.c 2012-04-20 08:23:49 UTC (rev 45800)
@@ -1869,13 +1869,11 @@
register_node_type_cmp_stabilize2d(ttype);
register_node_type_cmp_moviedistortion(ttype);
- register_node_type_cmp_dilateerode2(ttype);
register_node_type_cmp_boxmask(ttype);
register_node_type_cmp_ellipsemask(ttype);
register_node_type_cmp_bokehimage(ttype);
register_node_type_cmp_bokehblur(ttype);
register_node_type_cmp_switch(ttype);
- register_node_type_cmp_opencltest(ttype);
register_node_type_cmp_sampler(ttype);
}
Modified: branches/tile/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/compositor/CMakeLists.txt 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/compositor/CMakeLists.txt 2012-04-20 08:23:49 UTC (rev 45800)
@@ -105,8 +105,6 @@
operations/COM_QualityStepHelper.cpp
# Internal nodes
- nodes/COM_ConvertDataTypeNode.cpp
- nodes/COM_ConvertDataTypeNode.h
nodes/COM_MuteNode.cpp
nodes/COM_MuteNode.h
nodes/COM_GroupNode.cpp
@@ -182,8 +180,6 @@
nodes/COM_GlareNode.cpp
nodes/COM_GlareNode.h
- nodes/COM_LensFlareNode.cpp
- nodes/COM_LensFlareNode.h
operations/COM_LensGlowOperation.cpp
operations/COM_LensGlowOperation.h
@@ -219,8 +215,6 @@
nodes/COM_InvertNode.h
nodes/COM_GammaNode.cpp
nodes/COM_GammaNode.h
-# nodes/COM_ColorSpaceNode.cpp
-# nodes/COM_ColorSpaceNode.h
nodes/COM_SetAlphaNode.cpp
nodes/COM_SetAlphaNode.h
nodes/COM_ConvertAlphaNode.cpp
@@ -286,8 +280,6 @@
nodes/COM_FilterNode.cpp
nodes/COM_FilterNode.h
- nodes/COM_DilateErode2Node.cpp
- nodes/COM_DilateErode2Node.h
nodes/COM_DilateErodeNode.cpp
nodes/COM_DilateErodeNode.h
nodes/COM_BlurNode.cpp
@@ -584,21 +576,12 @@
operations/COM_DotproductOperation.cpp
operations/COM_DotproductOperation.h
-
-# operations/COM_ConvertColorSpaceOperation.h
-# operations/COM_ConvertColorSpaceOperation.cpp
-
# Matte operation
operations/COM_BoxMaskOperation.h
operations/COM_BoxMaskOperation.cpp
operations/COM_EllipseMaskOperation.h
operations/COM_EllipseMaskOperation.cpp
- nodes/COM_OpenCLTestNode.cpp
- nodes/COM_OpenCLTestNode.h
- operations/COM_OpenCLTestOperation.cpp
- operations/COM_OpenCLTestOperation.h
-
operations/COM_MovieClipOperation.cpp
operations/COM_MovieClipOperation.h
operations/COM_ConvertColorProfileOperation.cpp
Modified: branches/tile/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Converter.cpp 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/compositor/intern/COM_Converter.cpp 2012-04-20 08:23:49 UTC (rev 45800)
@@ -63,7 +63,6 @@
#include "COM_BokehImageNode.h"
#include "COM_ColorCurveNode.h"
#include "COM_VectorCurveNode.h"
-#include "COM_DilateErode2Node.h"
#include "COM_SetAlphaNode.h"
#include "COM_ConvertAlphaNode.h"
#include "COM_MapUVNode.h"
@@ -91,7 +90,6 @@
#include "COM_ColorNode.h"
#include "COM_ValueNode.h"
#include "COM_TimeNode.h"
-#include "COM_LensFlareNode.h"
#include "COM_DirectionalBlurNode.h"
#include "COM_ZCombineNode.h"
#include <stdio.h>
@@ -100,7 +98,6 @@
#include "COM_ExecutionSystemHelper.h"
#include "COM_TonemapNode.h"
#include "COM_SwitchNode.h"
-#include "COM_OpenCLTestNode.h"
#include "COM_GlareNode.h"
#include "COM_MovieClipNode.h"
#include "COM_ColorSpillNode.h"
@@ -210,9 +207,6 @@
case CMP_NODE_IMAGE:
node = new ImageNode(bNode);
break;
- case CMP_NODE_DILATEERODE2:
- node = new DilateErode2Node(bNode);
- break;
case CMP_NODE_SETALPHA:
node = new SetAlphaNode(bNode);
break;
@@ -287,7 +281,6 @@
break;
case CMP_NODE_LENSDIST:
node = new LensDistortionNode(bNode);
-// node = new FallbackNode(bNode);
break;
case CMP_NODE_RGB:
node = new ColorNode(bNode);
@@ -301,9 +294,6 @@
case CMP_NODE_DBLUR:
node = new DirectionalBlurNode(bNode);
break;
- case CMP_NODE_LENSFLARE:
- node = new LensFlareNode(bNode);
- break;
case CMP_NODE_ZCOMBINE:
node = new ZCombineNode(bNode);
break;
@@ -313,9 +303,6 @@
case CMP_NODE_SWITCH:
node = new SwitchNode(bNode);
break;
- case CMP_NODE_OPENCLTEST:
- node = new OpenCLTestNode(bNode);
- break;
case CMP_NODE_GLARE:
node = new GlareNode(bNode);
break;
Deleted: branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.cpp 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.cpp 2012-04-20 08:23:49 UTC (rev 45800)
@@ -1,23 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor:
- * Jeroen Bakker
- * Monique Dewanchand
- */
-
-#include "COM_ConvertDataTypeNode.h"
Deleted: branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.h 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/compositor/nodes/COM_ConvertDataTypeNode.h 2012-04-20 08:23:49 UTC (rev 45800)
@@ -1,22 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor:
- * Jeroen Bakker
- * Monique Dewanchand
- */
-
Deleted: branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.cpp 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.cpp 2012-04-20 08:23:49 UTC (rev 45800)
@@ -1,42 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor:
- * Jeroen Bakker
- * Monique Dewanchand
- */
-
-#include "COM_DilateErode2Node.h"
-#include "DNA_scene_types.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_DilateErodeOperation.h"
-
-DilateErode2Node::DilateErode2Node(bNode *editorNode): Node(editorNode) {
-}
-
-void DilateErode2Node::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
- bNode* editorNode = this->getbNode();
- NodeDilateErode * data = (NodeDilateErode*)editorNode->storage;
- DilateErodeOperation *operation = new DilateErodeOperation();
-
- this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0));
- this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket(0));
-
- operation->setData(data);
-
- graph->addOperation(operation);
-}
Deleted: branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.h 2012-04-19 23:23:29 UTC (rev 45799)
+++ branches/tile/source/blender/compositor/nodes/COM_DilateErode2Node.h 2012-04-20 08:23:49 UTC (rev 45800)
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011, Blender Foundation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contributor:
- * Jeroen Bakker
- * Monique Dewanchand
- */
-
-#ifndef _COM_DilateErode2Node_h_
-#define _COM_DilateErode2Node_h_
-
-#include "COM_Node.h"
-
-/**
- * @brief DilateErode2Node
- * @ingroup Node
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list