mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 10:21:11 +00:00
Merge branch 'editormarkerrendering' into 'master'
NifLoader: Only handle editor marker extra data for the root node See merge request OpenMW/openmw!3595
This commit is contained in:
commit
94ea0541f3
@ -679,10 +679,11 @@ namespace NifOsg
|
|||||||
|
|
||||||
// String markers may contain important information
|
// String markers may contain important information
|
||||||
// affecting the entire subtree of this obj
|
// affecting the entire subtree of this obj
|
||||||
if (sd->mData == "MRK" && !Loader::getShowMarkers())
|
if (sd->mData == "MRK")
|
||||||
{
|
{
|
||||||
// Marker objects. These meshes are only visible in the editor.
|
// Marker objects. These meshes are only visible in the editor.
|
||||||
args.mHasMarkers = true;
|
if (!Loader::getShowMarkers() && args.mRootNode == node)
|
||||||
|
args.mHasMarkers = true;
|
||||||
}
|
}
|
||||||
else if (sd->mData == "BONE")
|
else if (sd->mData == "BONE")
|
||||||
{
|
{
|
||||||
@ -696,8 +697,12 @@ namespace NifOsg
|
|||||||
}
|
}
|
||||||
else if (e->recType == Nif::RC_BSXFlags)
|
else if (e->recType == Nif::RC_BSXFlags)
|
||||||
{
|
{
|
||||||
|
if (args.mRootNode != node)
|
||||||
|
continue;
|
||||||
|
|
||||||
auto bsxFlags = static_cast<const Nif::NiIntegerExtraData*>(e.getPtr());
|
auto bsxFlags = static_cast<const Nif::NiIntegerExtraData*>(e.getPtr());
|
||||||
if (bsxFlags->mData & 32) // Editor marker flag
|
// Marker objects.
|
||||||
|
if (!Loader::getShowMarkers() && (bsxFlags->mData & 32))
|
||||||
args.mHasMarkers = true;
|
args.mHasMarkers = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user