Revision: 46683
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46683
Author: jbakker
Date: 2012-05-16 08:36:09 +0000 (Wed, 16 May 2012)
Log Message:
-----------
TileBranch
* remove unused test-nodes
Modified Paths:
--------------
branches/tile/source/blender/blenkernel/BKE_node.h
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/compositor/operations/COM_DilateErodeOperation.h
branches/tile/source/blender/editors/space_node/drawnode.c
branches/tile/source/blender/makesdna/DNA_node_types.h
branches/tile/source/blender/makesrna/intern/rna_nodetree.c
branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h
branches/tile/source/blender/nodes/CMakeLists.txt
branches/tile/source/blender/nodes/NOD_composite.h
Removed Paths:
-------------
branches/tile/source/blender/compositor/nodes/COM_SamplerNode.cpp
branches/tile/source/blender/compositor/nodes/COM_SamplerNode.h
branches/tile/source/blender/nodes/composite/nodes/node_composite_dilate2.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_opencltest.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_sampler.c
Modified: branches/tile/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/tile/source/blender/blenkernel/BKE_node.h 2012-05-16 08:18:09 UTC
(rev 46682)
+++ branches/tile/source/blender/blenkernel/BKE_node.h 2012-05-16 08:36:09 UTC
(rev 46683)
@@ -660,7 +660,6 @@
#define CMP_NODE_TONEMAP 302
#define CMP_NODE_LENSDIST 303
-#define CMP_NODE_DILATEERODE2 311
#define CMP_NODE_COLORCORRECTION 312
#define CMP_NODE_MASK_BOX 313
#define CMP_NODE_MASK_ELLIPSE 314
@@ -669,9 +668,6 @@
#define CMP_NODE_LENSFLARE 317
#define CMP_NODE_SWITCH 318
-#define CMP_NODE_OPENCLTEST 319
-#define CMP_NODE_SAMPLER 320
-
/* channel toggles */
#define CMP_CHAN_RGB 1
#define CMP_CHAN_A 2
Modified: branches/tile/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/tile/source/blender/blenkernel/intern/node.c 2012-05-16
08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/blenkernel/intern/node.c 2012-05-16
08:36:09 UTC (rev 46683)
@@ -1874,7 +1874,6 @@
register_node_type_cmp_bokehimage(ttype);
register_node_type_cmp_bokehblur(ttype);
register_node_type_cmp_switch(ttype);
- register_node_type_cmp_sampler(ttype);
}
static void registerShaderNodes(bNodeTreeType *ttype)
Modified: branches/tile/source/blender/compositor/CMakeLists.txt
===================================================================
--- branches/tile/source/blender/compositor/CMakeLists.txt 2012-05-16
08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/compositor/CMakeLists.txt 2012-05-16
08:36:09 UTC (rev 46683)
@@ -272,8 +272,6 @@
operations/COM_NormalizeOperation.h
# Filter nodes
- nodes/COM_SamplerNode.cpp
- nodes/COM_SamplerNode.h
nodes/COM_BilateralBlurNode.cpp
nodes/COM_BilateralBlurNode.h
operations/COM_BilateralBlurOperation.cpp
Modified: branches/tile/source/blender/compositor/intern/COM_Converter.cpp
===================================================================
--- branches/tile/source/blender/compositor/intern/COM_Converter.cpp
2012-05-16 08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/compositor/intern/COM_Converter.cpp
2012-05-16 08:36:09 UTC (rev 46683)
@@ -104,7 +104,6 @@
#include "COM_MapValueNode.h"
#include "COM_TransformNode.h"
#include "COM_Stabilize2dNode.h"
-#include "COM_SamplerNode.h"
#include "COM_BilateralBlurNode.h"
#include "COM_VectorBlurNode.h"
#include "COM_MovieDistortionNode.h"
@@ -328,9 +327,6 @@
case CMP_NODE_STABILIZE2D:
node = new Stabilize2dNode(bNode);
break;
- case CMP_NODE_SAMPLER:
- node = new SamplerNode(bNode);
- break;
case CMP_NODE_BILATERALBLUR:
node = new BilateralBlurNode(bNode);
break;
Deleted: branches/tile/source/blender/compositor/nodes/COM_SamplerNode.cpp
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_SamplerNode.cpp
2012-05-16 08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/compositor/nodes/COM_SamplerNode.cpp
2012-05-16 08:36:09 UTC (rev 46683)
@@ -1,48 +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_SamplerNode.h"
-#include "DNA_scene_types.h"
-#include "COM_SetSamplerOperation.h"
-#include "COM_ExecutionSystem.h"
-
-SamplerNode::SamplerNode(bNode *editorNode): Node(editorNode) {
-}
-
-void SamplerNode::convertToOperations(ExecutionSystem *system,
CompositorContext * context) {
- SetSamplerOperation *operation = new SetSamplerOperation();
-
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), true,
0, system);
-
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());
- bNode* node = this->getbNode();
- switch (node->custom1) {
- case 0:
- operation->setSampler(COM_PS_NEAREST);
- break;
- case 1:
- operation->setSampler(COM_PS_BILINEAR);
- break;
- case 2:
- operation->setSampler(COM_PS_BICUBIC);
- break;
- }
- system->addOperation(operation);
-}
Deleted: branches/tile/source/blender/compositor/nodes/COM_SamplerNode.h
===================================================================
--- branches/tile/source/blender/compositor/nodes/COM_SamplerNode.h
2012-05-16 08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/compositor/nodes/COM_SamplerNode.h
2012-05-16 08:36:09 UTC (rev 46683)
@@ -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_SamplerNode_h_
-#define _COM_SamplerNode_h_
-
-#include "COM_Node.h"
-
-/**
- * @brief SamplerNode
- * @ingroup Node
- */
-class SamplerNode: public Node {
-public:
- SamplerNode(bNode *editorNode);
- void convertToOperations(ExecutionSystem* graph, CompositorContext *
context);
-};
-
-#endif
Modified:
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h
===================================================================
---
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h
2012-05-16 08:18:09 UTC (rev 46682)
+++
branches/tile/source/blender/compositor/operations/COM_DilateErodeOperation.h
2012-05-16 08:36:09 UTC (rev 46683)
@@ -60,7 +60,6 @@
*/
void deinitExecution();
- void setData(NodeDilateErode* data) {this->distance=
data->distance;this->inset = data->inset;this->_switch = data->sw;}
void setDistance(float distance) {this->distance = distance;}
void setSwitch(float sw) {this->_switch = sw;}
void setInset(float inset) {this->inset = inset;}
Modified: branches/tile/source/blender/editors/space_node/drawnode.c
===================================================================
--- branches/tile/source/blender/editors/space_node/drawnode.c 2012-05-16
08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/editors/space_node/drawnode.c 2012-05-16
08:36:09 UTC (rev 46683)
@@ -1702,11 +1702,6 @@
uiItemR(layout, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
}
-static void node_composit_buts_sampler(uiLayout *layout, bContext *UNUSED(C),
PointerRNA *ptr)
-{
- uiItemR(layout, ptr, "filter_type", 0, "", ICON_NONE);
-}
-
static void node_composit_buts_colorcorrection(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *ptr)
{
uiLayout *row;
@@ -1914,13 +1909,6 @@
uiItemR(layout, ptr, "distortion_type", 0, "", 0);
}
-static void node_composit_buts_dilateerode2(uiLayout *layout, bContext
*UNUSED(C), PointerRNA *ptr)
-{
- uiItemR(layout, ptr, "distance", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
- uiItemR(layout, ptr, "inset", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
- uiItemR(layout, ptr, "check", UI_ITEM_R_SLIDER, NULL, ICON_NONE);
-}
-
static void node_composit_buts_switch(uiLayout *layout, bContext *UNUSED(C),
PointerRNA *ptr)
{
uiItemR(layout, ptr, "check", 0, NULL, ICON_NONE);
@@ -2256,9 +2244,6 @@
case CMP_NODE_MOVIEDISTORTION:
ntype->uifunc= node_composit_buts_moviedistortion;
break;
- case CMP_NODE_DILATEERODE2:
- ntype->uifunc= node_composit_buts_dilateerode2;
- break;
case CMP_NODE_SWITCH:
ntype->uifunc= node_composit_buts_switch;
break;
@@ -2273,9 +2258,6 @@
case CMP_NODE_BOKEHIMAGE:
ntype->uifunc= node_composit_buts_bokehimage;
break;
- case CMP_NODE_SAMPLER:
- ntype->uifunc= node_composit_buts_sampler;
- break;
case CMP_NODE_VIEWER:
ntype->uifunc = NULL;
ntype->uifuncbut= node_composit_buts_viewer_but;
Modified: branches/tile/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/tile/source/blender/makesdna/DNA_node_types.h 2012-05-16
08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/makesdna/DNA_node_types.h 2012-05-16
08:36:09 UTC (rev 46683)
@@ -402,13 +402,6 @@
int pad;
} NodeEllipseMask;
-typedef struct NodeDilateErode {
- float distance;
- float inset;
- float sw;
- int pad;
-} NodeDilateErode;
-
typedef struct NodeBlurData {
short sizex, sizey;
short samples, maxspeed, minspeed, relative, aspect;
Modified: branches/tile/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/tile/source/blender/makesrna/intern/rna_nodetree.c 2012-05-16
08:18:09 UTC (rev 46682)
+++ branches/tile/source/blender/makesrna/intern/rna_nodetree.c 2012-05-16
08:36:09 UTC (rev 46683)
@@ -1595,51 +1595,6 @@
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
}
-static void def_cmp_dilate_erode2(StructRNA *srna)
-{
- PropertyRNA *prop;
-
- RNA_def_struct_sdna_from(srna, "NodeDilateErode", "storage");
-
- prop = RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
- RNA_def_property_float_sdna(prop, NULL, "distance");
- RNA_def_property_float_default(prop, 0.0f);
- RNA_def_property_range(prop, -100, 100);
- RNA_def_property_ui_text(prop, "Distance", "Distance to grow/shrink");
- RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
