asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-fixed NODE_OUT error in animtreeplayer #1078

Browse source 
-fixed randon button when editing menubutton #1079
This commit is contained in:
Juan Linietsky 2015-01-02 12:52:51 -03:00
parent 530d717a67
commit 0378e1109b
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scene/animation/animation_tree_player.cpp
View file

@ -83,7 +83,8 @@ bool AnimationTreePlayer::_set(const StringName& p_name, const Variant& p_value)
ERR_FAIL_COND_V(nt==NODE_MAX,false); 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); node_set_pos(id,pos);

1
tools/editor/plugins/item_list_editor_plugin.cpp
View file

@ -210,6 +210,7 @@ void ItemListEditor::_bind_methods() {
} }
bool ItemListEditor::handles(Object *p_object) const { bool ItemListEditor::handles(Object *p_object) const {
return false;
for(int i=0;i<item_plugins.size();i++) { for(int i=0;i<item_plugins.size();i++) {
if (item_plugins[i]->handles(p_object)) { if (item_plugins[i]->handles(p_object)) {
return true; return true;