Merge commit '173f350be76237a7dee9c00c389dff4e56b3da4c' into garux-merge

[xonotic/netradiant.git] / plugins / entity / doom3group.cpp

diff --git a/plugins/entity/doom3group.cpp b/plugins/entity/doom3group.cpp
index ceb19b0b876055350f306b2989fcf0efe567bcac..b3daa405a8320077de5f72b10cbd5c40017111b1 100644 (file)
--- a/plugins/entity/doom3group.cpp
+++ b/plugins/entity/doom3group.cpp
@@ -91,8 +91,8 @@ NameKeys m_nameKeys;
 TraversableObserverPairRelay m_traverseObservers;
 Doom3GroupOrigin m_funcStaticOrigin;
 RenderablePivot m_renderOrigin;
-RenderableNamedEntity m_renderName;
 mutable Vector3 m_name_origin;
+RenderableNamedEntity m_renderName;
 ModelSkinKey m_skin;
 
 public:
@@ -259,8 +259,8 @@ Doom3Group( EntityClass* eclass, scene::Node& node, const Callback<void()>& tran
        m_named( m_entity ),
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_origin ),
-       m_renderName( m_named, m_name_origin ),
        m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_skin( SkinChangedCaller( *this ) ),
        m_curveNURBS( boundsChanged ),
        m_curveCatmullRom( boundsChanged ),
@@ -278,7 +278,8 @@ Doom3Group( const Doom3Group& other, scene::Node& node, const Callback<void()>&
        m_named( m_entity ),
        m_nameKeys( m_entity ),
        m_funcStaticOrigin( m_traverse, m_origin ),
-       m_renderName( m_named, g_vector3_identity ),
+       m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_skin( SkinChangedCaller( *this ) ),
        m_curveNURBS( boundsChanged ),
        m_curveCatmullRom( boundsChanged ),