From b085c40edfac45ec1c8b866c789f6e9bab7e5e08 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Wed, 4 Jan 2017 01:16:14 -0300
Subject: -Conversion of most properties to a simpler syntax, easier to use by
 script -Modified help to display properties

GDScript can still not make use of them, though.
---
 scene/gui/color_picker.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scene/gui/color_picker.cpp')

diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index 05d455be2..8000b5b11 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -122,7 +122,7 @@ void ColorPicker::_value_changed(double) {
 		return;
 
 	for(int i=0;i<4;i++) {
-		color.components[i] = scroll[i]->get_val()/(raw_mode_enabled?1.0:255.0);
+		color.components[i] = scroll[i]->get_value()/(raw_mode_enabled?1.0:255.0);
 	}
 
 	set_color(color);
@@ -157,9 +157,9 @@ void ColorPicker::_update_color() {
 		if (raw_mode_enabled) {
 			if (i == 3)
 				scroll[i]->set_max(1);
-			scroll[i]->set_val(color.components[i]);
+			scroll[i]->set_value(color.components[i]);
 		} else {
-			scroll[i]->set_val(color.components[i] * 255);
+			scroll[i]->set_value(color.components[i] * 255);
 		}
 	}
 
-- 
cgit v1.2.3-70-g09d2