DarkRadiant: master 9b7a4b8c

Diff Back to Repository
Author Committer Branch Timestamp Parent
orbweaver orbweaver master 18.08.2021 20:05 master 60715c73
Changeset Fix incorrect colours before Colour Schemes dialog shown

The recent switch to threaded loading of entityDefs, while valid in itself,
exposed a bug with entity class colour overrides.

EntityClass::resetColour() did not contain any code to check for colour
overrides in the EClassColourManager, which meant that an overridden colour set
with setColour() could be lost if any subsequent change triggered a call to
resetColour().

The resetColour() method therefore now checks for colour overrides before doing
anything else, and returns immediately if an override colour is set.
mod - include/ieclasscolours.h Diff File
mod - radiantcore/eclass/EClassColourManager.cpp Diff File
mod - radiantcore/eclass/EClassColourManager.h Diff File
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File