]> git.sesse.net Git - nageru/commitdiff
Scene doesn't need theme->input_state to be set, as we never get Lua callacks from...
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 15 Jun 2019 14:23:24 +0000 (16:23 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 15 Jun 2019 14:23:24 +0000 (16:23 +0200)
nageru/scene.cpp

index 0d10be5b8cba5876363367b7007c43cb2f0ac2ba..6eb86ac91e6f85e1cf45120cc82910aceb3a0374 100644 (file)
@@ -385,9 +385,6 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
        auto setup_chain = [L, theme, signals_to_connect, images_to_select, int_to_set, float_to_set, vec3_to_set, vec4_to_set, input_state]{
                lock_guard<mutex> lock(theme->m);
 
-               assert(theme->input_state == nullptr);
-               theme->input_state = &input_state;
-
                // Set up state, including connecting signals.
                for (const auto &input_and_signal : signals_to_connect) {
                        LiveInputWrapper *input = input_and_signal.first;
@@ -430,8 +427,6 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
                                                value[0], value[1], value[2], value[3]);
                        }
                }
-
-               theme->input_state = nullptr;
        };
        return make_pair(effect_chain, move(setup_chain));
 }