Make secondary handle 50% transparent in Path editor to distinguish from

main handle; Add close curve icon in Path editor UI; Fixed mixed EOL

1 files changed, 30 insertions, 31 deletions

diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/tools/editor/plugins/path_editor_plugin.cpp
index 1c910e5436..61b1df9ca8 100644
--- a/tools/editor/plugins/path_editor_plugin.cpp
+++ b/tools/editor/plugins/path_editor_plugin.cpp
@@ -1,31 +1,31 @@
-/*************************************************************************/
-/*  path_editor_plugin.cpp                                               */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                    http://www.godotengine.org                         */
-/*************************************************************************/
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
+/*************************************************************************/

+/*  path_editor_plugin.cpp                                               */

+/*************************************************************************/

+/*                       This file is part of:                           */

+/*                           GODOT ENGINE                                */

+/*                    http://www.godotengine.org                         */

+/*************************************************************************/

+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                 */

+/*                                                                       */

+/* Permission is hereby granted, free of charge, to any person obtaining */

+/* a copy of this software and associated documentation files (the       */

+/* "Software"), to deal in the Software without restriction, including   */

+/* without limitation the rights to use, copy, modify, merge, publish,   */

+/* distribute, sublicense, and/or sell copies of the Software, and to    */

+/* permit persons to whom the Software is furnished to do so, subject to */

+/* the following conditions:                                             */

+/*                                                                       */

+/* The above copyright notice and this permission notice shall be        */

+/* included in all copies or substantial portions of the Software.       */

+/*                                                                       */

+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */

+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */

+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/

+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */

+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */

+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */

+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */

+/*************************************************************************/

 #include "path_editor_plugin.h"

 #include "spatial_editor_plugin.h"

 #include "scene/resources/curve.h"

@@ -565,9 +565,8 @@ PathEditorPlugin::PathEditorPlugin(EditorNode *p_node) {
 	curve_del->set_tooltip("Delete Point.");

 	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_del);

     curve_close = memnew( ToolButton );

-//curve_close->set_icon(SpatialEditor::get_singleton()->get_icon("CurveDelete","EditorIcons"));

-    curve_close->set_text("close");

-    curve_close->hide();

+	curve_close->set_icon(SpatialEditor::get_singleton()->get_icon("CurveClose","EditorIcons"));

+	curve_close->hide();

     curve_close->set_focus_mode(Control::FOCUS_NONE);

     curve_close->set_tooltip("Close Curve");

     SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_close);