summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-01-02 12:52:51 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-01-02 12:52:51 -0300
commit0378e1109b8ff96a3583d7da02966ef3344ee35a (patch)
tree63554eefbc2102de57c8bc49fc65d92fa6c2ba09
parent530d717a67cc3acab10270dca700db328aa12891 (diff)
-fixed NODE_OUT error in animtreeplayer #1078
-fixed randon button when editing menubutton #1079
-rw-r--r--scene/animation/animation_tree_player.cpp3
-rw-r--r--tools/editor/plugins/item_list_editor_plugin.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp
index ec72123c98..5172907d18 100644
--- a/scene/animation/animation_tree_player.cpp
+++ b/scene/animation/animation_tree_player.cpp
@@ -83,7 +83,8 @@ bool AnimationTreePlayer::_set(const StringName& p_name, const Variant& p_value)
ERR_FAIL_COND_V(nt==NODE_MAX,false);
- add_node(nt,id);
+ if (nt!=NODE_OUTPUT)
+ add_node(nt,id);
node_set_pos(id,pos);
diff --git a/tools/editor/plugins/item_list_editor_plugin.cpp b/tools/editor/plugins/item_list_editor_plugin.cpp
index eb7ab69987..a8b34ef503 100644
--- a/tools/editor/plugins/item_list_editor_plugin.cpp
+++ b/tools/editor/plugins/item_list_editor_plugin.cpp
@@ -210,6 +210,7 @@ void ItemListEditor::_bind_methods() {
}
bool ItemListEditor::handles(Object *p_object) const {
+ return false;
for(int i=0;i<item_plugins.size();i++) {
if (item_plugins[i]->handles(p_object)) {
return true;