summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-07-06 23:46:04 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-07-06 23:46:04 -0300
commit7c1ab42571d5291952e329554643142a30dee1d1 (patch)
treec496f23203877c6cfe99a809e97da74505fad7fa /tools
parent17e4ead62a949e2a1568574228a157ea4b403d30 (diff)
Fix the +1 button to insert keyframes in Sprite and Sprite3D, closes #5422
Diffstat (limited to 'tools')
-rw-r--r--tools/editor/editor_resource_preview.cpp2
-rw-r--r--tools/editor/editor_resource_preview.h2
-rw-r--r--tools/editor/property_editor.cpp4
3 files changed, 3 insertions, 5 deletions
diff --git a/tools/editor/editor_resource_preview.cpp b/tools/editor/editor_resource_preview.cpp
index 18ce2bd7f4..6e38d6460b 100644
--- a/tools/editor/editor_resource_preview.cpp
+++ b/tools/editor/editor_resource_preview.cpp
@@ -336,7 +336,7 @@ void EditorResourcePreview::_bind_methods() {
ADD_SIGNAL(MethodInfo("preview_invalidated",PropertyInfo(Variant::STRING,"path")));
}
-bool EditorResourcePreview::check_for_invalidation(const String& p_path) {
+void EditorResourcePreview::check_for_invalidation(const String& p_path) {
preview_mutex->lock();
diff --git a/tools/editor/editor_resource_preview.h b/tools/editor/editor_resource_preview.h
index fed8f129ed..51a00965eb 100644
--- a/tools/editor/editor_resource_preview.h
+++ b/tools/editor/editor_resource_preview.h
@@ -121,7 +121,7 @@ public:
void queue_edited_resource_preview(const Ref<Resource>& p_path, Object* p_receiver, const StringName& p_receiver_func, const Variant& p_userdata);
void add_preview_generator(const Ref<EditorResourcePreviewGenerator>& p_generator);
- bool check_for_invalidation(const String& p_path);
+ void check_for_invalidation(const String& p_path);
EditorResourcePreview();
~EditorResourcePreview();
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index e0dc76e733..4b3f245e44 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -2981,10 +2981,8 @@ void PropertyEditor::update_tree() {
else
item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE_EXPRESSION );
- if (p.hint==PROPERTY_HINT_SPRITE_FRAME) {
- item->set_range_config(1,0,99999,1);
- } else if (p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
+ if (p.hint==PROPERTY_HINT_SPRITE_FRAME || p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
int c = p.hint_string.get_slice_count(",");
float min=0,max=100,step=1;