diff options
Diffstat (limited to 'editor/editor_properties.h')
| -rw-r--r-- | editor/editor_properties.h | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/editor/editor_properties.h b/editor/editor_properties.h index a9751e3d16..df01ee83b5 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -106,6 +106,7 @@ class EditorPropertyPath : public EditorProperty { Vector<String> extensions; bool folder; bool global; + bool save_mode; EditorFileDialog *dialog; LineEdit *path; Button *path_edit; @@ -120,6 +121,7 @@ protected: public: void setup(const Vector<String> &p_extensions, bool p_folder, bool p_global); + void set_save_mode(); virtual void update_property(); EditorPropertyPath(); }; @@ -497,6 +499,7 @@ class EditorPropertyNodePath : public EditorProperty { Button *clear; SceneTreeDialog *scene_tree; NodePath base_hint; + bool use_path_from_scene_root; Vector<StringName> valid_types; void _node_selected(const NodePath &p_path); @@ -509,10 +512,19 @@ protected: public: virtual void update_property(); - void setup(const NodePath &p_base_hint, Vector<StringName> p_valid_types); + void setup(const NodePath &p_base_hint, Vector<StringName> p_valid_types, bool p_use_path_from_scene_root = true); EditorPropertyNodePath(); }; +class EditorPropertyRID : public EditorProperty { + GDCLASS(EditorPropertyRID, EditorProperty) + Label *label; + +public: + virtual void update_property(); + EditorPropertyRID(); +}; + class EditorPropertyResource : public EditorProperty { GDCLASS(EditorPropertyResource, EditorProperty) @@ -522,10 +534,11 @@ class EditorPropertyResource : public EditorProperty { OBJ_MENU_EDIT = 1, OBJ_MENU_CLEAR = 2, OBJ_MENU_MAKE_UNIQUE = 3, - OBJ_MENU_COPY = 4, - OBJ_MENU_PASTE = 5, - OBJ_MENU_NEW_SCRIPT = 6, - OBJ_MENU_SHOW_IN_FILE_SYSTEM = 7, + OBJ_MENU_SAVE = 4, + OBJ_MENU_COPY = 5, + OBJ_MENU_PASTE = 6, + OBJ_MENU_NEW_SCRIPT = 7, + OBJ_MENU_SHOW_IN_FILE_SYSTEM = 8, TYPE_BASE_ID = 100, CONVERT_BASE_ID = 1000 |