mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 22:11:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'init_variables' into 'master'

Browse source 
Add missing initialization

See merge request OpenMW/openmw!3722
This commit is contained in:
Alexei Kotov 2024-01-04 20:31:55 +00:00
commit c5a3b516d6
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwrender/pingpongcanvas.hpp
View file

@ -61,7 +61,7 @@ namespace MWRender
bool mPostprocessing = false; bool mPostprocessing = false;
fx::DispatchArray mPasses; fx::DispatchArray mPasses;
fx::FlagsType mMask; fx::FlagsType mMask = 0;
osg::ref_ptr<osg::Program> mFallbackProgram; osg::ref_ptr<osg::Program> mFallbackProgram;
osg::ref_ptr<osg::Program> mMultiviewResolveProgram; osg::ref_ptr<osg::Program> mMultiviewResolveProgram;

2
components/nifosg/controller.cpp
View file

@ -442,7 +442,7 @@ namespace NifOsg
} }
} }
MaterialColorController::MaterialColorController() {} MaterialColorController::MaterialColorController() = default;
MaterialColorController::MaterialColorController( MaterialColorController::MaterialColorController(
const Nif::NiMaterialColorController* ctrl, const osg::Material* baseMaterial) const Nif::NiMaterialColorController* ctrl, const osg::Material* baseMaterial)

4
components/nifosg/controller.hpp
View file

@ -347,7 +347,9 @@ namespace NifOsg
private: private:
Vec3Interpolator mData; Vec3Interpolator mData;
Nif::NiMaterialColorController::TargetColor mTargetColor; Nif::NiMaterialColorController::TargetColor mTargetColor{
Nif::NiMaterialColorController::TargetColor::Ambient
};
osg::ref_ptr<const osg::Material> mBaseMaterial; osg::ref_ptr<const osg::Material> mBaseMaterial;
}; };