Skip to content

Commit 9a3cc69

Browse files
author
devsh
committed
default AS patch constructor default values so patches merge correctly
1 parent 1181321 commit 9a3cc69

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

include/nbl/video/utilities/CAssetConverter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class CAssetConverter : public core::IReferenceCounted
175175
//! select build flags
176176
uint8_t allowUpdate : 1 = false;
177177
uint8_t allowCompaction : 1 = false;
178-
BuildPreference preference : 2 = BuildPreference::Invalid;
178+
BuildPreference preference : 2 = BuildPreference::None;
179179
uint8_t lowMemory : 1 = false;
180180
//! things that control the build
181181
uint8_t hostBuild : 1 = false; // DO NOT USE, will get overriden to false anyway
@@ -187,7 +187,7 @@ class CAssetConverter : public core::IReferenceCounted
187187
template<typename CRTP>
188188
std::pair<bool,CRTP> combine_impl(const CRTP& _this, const CRTP& other) const
189189
{
190-
if (_this.preference!=other.preference || _this.preference==BuildPreference::Invalid)
190+
if (_this.preference!=other.preference && _this.preference!=BuildPreference::None && other.preference!=BuildPreference::None)
191191
return {false,_this};
192192
CRTP retval = _this;
193193
retval.isMotion |= other.isMotion;

0 commit comments

Comments
 (0)