mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-16 08:42:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'static_copy' into 'master'

Browse Source 
Do not copy a static string

See merge request OpenMW/openmw!3399
This commit is contained in:
psi29a 2023-09-05 07:33:09 +00:00
commit 08b9da0023
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/fx/stateupdater.cpp
View File

@ -7,6 +7,8 @@
namespace fx namespace fx
{ {
std::string StateUpdater::sDefinition = UniformData::getDefinition("_omw_data");
StateUpdater::StateUpdater(bool useUBO) StateUpdater::StateUpdater(bool useUBO)
: mUseUBO(useUBO) : mUseUBO(useUBO)
{ {

8
components/fx/stateupdater.hpp
View File

@ -100,11 +100,7 @@ namespace fx
mPointLightBuffer = std::move(buffer); mPointLightBuffer = std::move(buffer);
} }
static std::string getStructDefinition() static const std::string& getStructDefinition() { return sDefinition; }
{
static std::string definition = UniformData::getDefinition("_omw_data");
return definition;
}
void setDefaults(osg::StateSet* stateset) override; void setDefaults(osg::StateSet* stateset) override;
@ -275,6 +271,8 @@ namespace fx
UniformData mData; UniformData mData;
bool mUseUBO; bool mUseUBO;
static std::string sDefinition;
std::shared_ptr<SceneUtil::PPLightBuffer> mPointLightBuffer; std::shared_ptr<SceneUtil::PPLightBuffer> mPointLightBuffer;
}; };
} }