Changeset 12716

Timestamp:

Sep 28, 2012, 9:16:32 PM (12 years ago)

Author:

ben

Message:

Fixes missing Atlas selection rings for decorative actors

File:

• ps/trunk/source/simulation2/components/CCmpSelectable.cpp (modified) (1 diff)

ps/trunk/source/simulation2/components/CCmpSelectable.cpp

@@ -533 +533 @@
         if (!m_Cached)
         {
-            // Try to initialize m_Color to the owning player's colour.
-            CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSimContext(), SYSTEM_ENTITY);
-            if (!cmpPlayerManager)
-                return;
-    
+            // Default to white if there's no owner (e.g. decorative, editor-only actors)
+            CColor color = CColor(1.0, 1.0, 1.0, 1.0);
             CmpPtr<ICmpOwnership> cmpOwnership(GetSimContext(), GetEntityId());
-            if (!cmpOwnership)
-                return;
-    
-            player_id_t owner = cmpOwnership->GetOwner();
-            if (owner == INVALID_PLAYER)
-                return;
-    
-            CmpPtr<ICmpPlayer> cmpPlayer(GetSimContext(), cmpPlayerManager->GetPlayerByID(owner));
-            if (!cmpPlayer)
-                return;
-
-            CColor color = cmpPlayer->GetColour();
+            if (cmpOwnership)
+            {
+                player_id_t owner = cmpOwnership->GetOwner();
+                if (owner == INVALID_PLAYER)
+                    return;
+
+                // Try to initialize m_Color to the owning player's colour.
+                CmpPtr<ICmpPlayerManager> cmpPlayerManager(GetSimContext(), SYSTEM_ENTITY);
+                if (!cmpPlayerManager)
+                    return;
+
+                CmpPtr<ICmpPlayer> cmpPlayer(GetSimContext(), cmpPlayerManager->GetPlayerByID(owner));
+                if (!cmpPlayer)
+                    return;
+
+                color = cmpPlayer->GetColour();
+            }
             color.a = m_FadeBaselineAlpha + m_FadeDeltaAlpha;