Merge branch 'master' of https://github.com/okamstudio/godot into shadow_color

Conflicts:
	drivers/gles2/shader_compiler_gles2.cpp

1 files changed, 2 insertions, 5 deletions

diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp
index 0d549108fa..c8930add6e 100644
--- a/scene/gui/texture_progress.cpp
+++ b/scene/gui/texture_progress.cpp
@@ -233,11 +233,7 @@ float TextureProgress::get_radial_initial_angle()
 
 void TextureProgress::set_fill_degrees(float p_angle)
 {
-	while(p_angle>360)
-		p_angle-=360;
-	while (p_angle<0)
-		p_angle+=360;
-	rad_max_degrees=p_angle;
+	rad_max_degrees=CLAMP(p_angle,0,360);
 	update();
 }
 
@@ -302,4 +298,5 @@ TextureProgress::TextureProgress()
 {
 	mode=FILL_LEFT_TO_RIGHT;
 	rad_center_off=Point2();
+	rad_max_degrees=360;
 }