aboutsummaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorJuan Linietsky2016-05-17 18:27:15 -0300
committerJuan Linietsky2016-05-17 18:28:44 -0300
commitc195c0df6b36debc870216dd42e49fbda70fa861 (patch)
tree194a26e39ace86d7a471f3e86159c2aed6be261c /scene/resources
parent3a26e14a2bab777c9ba6aedceff6e4ef2666faf0 (diff)
downloadgodot-c195c0d.tar.gz
godot-c195c0d.tar.zst
godot-c195c0d.zip
-Added configuration warning system for nodes
-Added a new "add" and "instance" buttons for scene tree -Added a vformat() function to ease translation work
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/default_theme/default_theme.cpp1
-rw-r--r--scene/resources/packed_scene.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp
index 9feadf91c..0c4d8ae84 100644
--- a/scene/resources/default_theme/default_theme.cpp
+++ b/scene/resources/default_theme/default_theme.cpp
@@ -417,6 +417,7 @@ void make_default_theme() {
t->set_constant("shadow_offset_x","Label", 1 );
t->set_constant("shadow_offset_y","Label", 1 );
t->set_constant("shadow_as_outline","Label", 0 );
+ t->set_constant("line_spacing","Label", 3 );
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp
index ef04c68e8..5df22ba8c 100644
--- a/scene/resources/packed_scene.cpp
+++ b/scene/resources/packed_scene.cpp
@@ -1493,7 +1493,7 @@ int SceneState::get_connection_flags(int p_idx) const{
Array SceneState::get_connection_binds(int p_idx) const {
- ERR_FAIL_INDEX_V(p_idx,connections.size(),-1);
+ ERR_FAIL_INDEX_V(p_idx,connections.size(),Array());
Array binds;
for(int i=0;i<connections[p_idx].binds.size();i++) {
binds.push_back(variants[connections[p_idx].binds[i]]);