From 2ab83e1abbf5ee6d00e16056a9e9394114026f28 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 7 Jan 2017 18:25:37 -0300
Subject: Memory pool vectors (DVector) have been enormously simplified in
 code, and renamed to PoolVector

---
 .../editor/plugins/shader_graph_editor_plugin.cpp  | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'tools/editor/plugins/shader_graph_editor_plugin.cpp')

diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index 15906563c..1f319a97c 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -986,13 +986,13 @@ void ShaderGraphView::_color_ramp_changed(int p_id,Node* p_ramp) {
 	Vector<float> offsets=cr->get_offsets();
 	Vector<Color> colors=cr->get_colors();
 
-	DVector<float> new_offsets;
-	DVector<Color> new_colors;
+	PoolVector<float> new_offsets;
+	PoolVector<Color> new_colors;
 	{
 		new_offsets.resize(offsets.size());
 		new_colors.resize(colors.size());
-		DVector<float>::Write ow=new_offsets.write();
-		DVector<Color>::Write cw=new_colors.write();
+		PoolVector<float>::Write ow=new_offsets.write();
+		PoolVector<Color>::Write cw=new_colors.write();
 		for(int i=0;i<new_offsets.size();i++) {
 			ow[i]=offsets[i];
 			cw[i]=colors[i];
@@ -1001,8 +1001,8 @@ void ShaderGraphView::_color_ramp_changed(int p_id,Node* p_ramp) {
 	}
 
 
-	DVector<float> old_offsets=graph->color_ramp_node_get_offsets(type,p_id);
-	DVector<Color> old_colors=graph->color_ramp_node_get_colors(type,p_id);
+	PoolVector<float> old_offsets=graph->color_ramp_node_get_offsets(type,p_id);
+	PoolVector<Color> old_colors=graph->color_ramp_node_get_colors(type,p_id);
 
 	if (old_offsets.size()!=new_offsets.size())
 		ur->create_action(TTR("Add/Remove to Color Ramp"));
@@ -1027,10 +1027,10 @@ void ShaderGraphView::_curve_changed(int p_id,Node* p_curve) {
 
 	Vector<Point2> points=cr->get_points();
 
-	DVector<Vector2> new_points;
+	PoolVector<Vector2> new_points;
 	{
 		new_points.resize(points.size());
-		DVector<Vector2>::Write ow=new_points.write();
+		PoolVector<Vector2>::Write ow=new_points.write();
 		for(int i=0;i<new_points.size();i++) {
 			ow[i]=points[i];
 		}
@@ -1038,7 +1038,7 @@ void ShaderGraphView::_curve_changed(int p_id,Node* p_curve) {
 	}
 
 
-	DVector<Vector2> old_points=graph->curve_map_node_get_points(type,p_id);
+	PoolVector<Vector2> old_points=graph->curve_map_node_get_points(type,p_id);
 
 	if (old_points.size()!=new_points.size())
 		ur->create_action(TTR("Add/Remove to Curve Map"));
@@ -2131,14 +2131,14 @@ void ShaderGraphView::_create_node(int p_id) {
 		gn->set_title("ColorRamp");
 		GraphColorRampEdit * ramp  = memnew( GraphColorRampEdit );
 
-		DVector<real_t> offsets = graph->color_ramp_node_get_offsets(type,p_id);
-		DVector<Color> colors = graph->color_ramp_node_get_colors(type,p_id);
+		PoolVector<real_t> offsets = graph->color_ramp_node_get_offsets(type,p_id);
+		PoolVector<Color> colors = graph->color_ramp_node_get_colors(type,p_id);
 
 		int oc = offsets.size();
 
 		if (oc) {
-			DVector<real_t>::Read rofs = offsets.read();
-			DVector<Color>::Read rcol = colors.read();
+			PoolVector<real_t>::Read rofs = offsets.read();
+			PoolVector<Color>::Read rcol = colors.read();
 
 			Vector<float> ofsv;
 			Vector<Color> colorv;
@@ -2184,12 +2184,12 @@ void ShaderGraphView::_create_node(int p_id) {
 		gn->set_title("CurveMap");
 		GraphCurveMapEdit * map  = memnew( GraphCurveMapEdit );
 
-		DVector<Vector2> points = graph->curve_map_node_get_points(type,p_id);
+		PoolVector<Vector2> points = graph->curve_map_node_get_points(type,p_id);
 
 		int oc = points.size();
 
 		if (oc) {
-			DVector<Vector2>::Read rofs = points.read();
+			PoolVector<Vector2>::Read rofs = points.read();
 
 
 			Vector<Vector2> ofsv;
-- 
cgit v1.2.3-70-g09d2