Skip to content

Commit

Permalink
Merge pull request godotengine#8502 from karroffel/multiscript
Browse files Browse the repository at this point in the history
re-added MultiScript
  • Loading branch information
akien-mga authored Apr 24, 2017
2 parents b474646 + 885239f commit 4c14700
Show file tree
Hide file tree
Showing 7 changed files with 1,049 additions and 2 deletions.
4 changes: 2 additions & 2 deletions modules/gdscript/gd_script.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1696,9 +1696,9 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so
//same thing for placeholders
#ifdef TOOLS_ENABLED

while (E->get()->placeholders.size()) {
for (Set<PlaceHolderScriptInstance *>::Element *P = E->get()->placeholders.front(); P; P = P->next()) {

Object *obj = E->get()->placeholders.front()->get()->get_owner();
Object *obj = P->get()->get_owner();
//save instance info
List<Pair<StringName, Variant> > state;
if (obj->get_script_instance()) {
Expand Down
7 changes: 7 additions & 0 deletions modules/multiscript/SCsub
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env python

Import('env')

env.add_source_files(env.modules_sources, "*.cpp")

Export('env')
8 changes: 8 additions & 0 deletions modules/multiscript/config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@


def can_build(platform):
return True


def configure(env):
pass
Loading

0 comments on commit 4c14700

Please sign in to comment.