From 8530bc5cf5f9d7c0722752cf179601722fe1a394 Mon Sep 17 00:00:00 2001 From: psi29a Date: Mon, 12 Jul 2021 08:59:07 +0000 Subject: [PATCH] Merge branch 'fix_debugbatch_colors' into 'master' Fix black objects in object paging debug view See merge request OpenMW/openmw!1011 (cherry picked from commit 5287c9627c92b77c25581dbb9ac9d0b0dc4c9698) 389b8300 fix black objects with OP batch debug due to unitialized uniform --- apps/openmw/mwrender/objectpaging.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp index 8c8d2a6ab2..6ab7ac4ce0 100644 --- a/apps/openmw/mwrender/objectpaging.cpp +++ b/apps/openmw/mwrender/objectpaging.cpp @@ -364,6 +364,7 @@ namespace MWRender osg::ref_ptr stateset = node.getStateSet() ? osg::clone(node.getStateSet(), osg::CopyOp::SHALLOW_COPY) : new osg::StateSet; stateset->setAttribute(m); stateset->addUniform(new osg::Uniform("colorMode", 0)); + stateset->addUniform(new osg::Uniform("emissiveMult", 1.f)); node.setStateSet(stateset); } };