Merge branch 'init_variables' into 'master'

Add missing initialization

See merge request OpenMW/openmw!3722
qt6_macos
Alexei Kotov 5 months ago
commit c5a3b516d6

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

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

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

Loading…
Cancel
Save