Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / client / clientenvironment.cpp

diff --git a/src/client/clientenvironment.cpp b/src/client/clientenvironment.cpp
index be2b358c5e52bed046ac5887bb81a1b978308049..5f44c30ac5a73aeab98c2b7fe226268ab2334177 100644 (file)
--- a/src/client/clientenvironment.cpp
+++ b/src/client/clientenvironment.cpp
@@ -51,12 +51,8 @@ class CAOShaderConstantSetter : public IShaderConstantSetter
 
        ~CAOShaderConstantSetter() override = default;
 
-       void onSetConstants(video::IMaterialRendererServices *services,
-                       bool is_highlevel) override
+       void onSetConstants(video::IMaterialRendererServices *services) override
        {
-               if (!is_highlevel)
-                       return;
-
                // Ambient color
                video::SColorf emissive_color(m_emissive_color);
 
@@ -347,11 +343,6 @@ bool isFreeClientActiveObjectId(const u16 id,
 
 u16 ClientEnvironment::addActiveObject(ClientActiveObject *object)
 {
-       GenericCAO *gcao = dynamic_cast<GenericCAO *>(object);
-       aabb3f box;
-       if (gcao && g_settings->getBool("noobject") && ! gcao->getSelectionBox(&box) && ! gcao->getParent())
-               return 0;
-
        // Register object. If failed return zero id
        if (!m_ao_manager.registerObject(object))
                return 0;