From aab373ac3ad588be28be530192be42d20f9859cf Mon Sep 17 00:00:00 2001
From: Scott Giese <scttgs0@gmail.com>
Date: Tue, 24 Nov 2020 11:26:57 -0600
Subject: [PATCH] Model Loading: Overlays

Cannot copy overlays until the props has been read.
Ticket: #2429
---
 simgear/scene/model/SGReaderWriterXML.cxx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/simgear/scene/model/SGReaderWriterXML.cxx b/simgear/scene/model/SGReaderWriterXML.cxx
index 9b1a9780..c3f23d44 100644
--- a/simgear/scene/model/SGReaderWriterXML.cxx
+++ b/simgear/scene/model/SGReaderWriterXML.cxx
@@ -528,15 +528,16 @@ sgLoad3DModel_internal(const SGPath& path,
     // Check for an XML wrapper
     if (modelpath.extension() == "xml") {
        try {
-           if (overlay)
-               copyProperties(overlay, props);
-
            readProperties(modelpath, props);
         } catch (const sg_exception &t) {
             SG_LOG(SG_IO, SG_DEV_ALERT, "Failed to load xml: "
                    << t.getFormattedMessage());
             throw;
         }
+
+        if (overlay)
+            copyProperties(overlay, props);
+
         if (options->getAutoTooltipsMaster()) {
             addTooltipAnimations(path, props, model, options->getAutoTooltipsMasterMax());
         }