Merge commit '173f350be76237a7dee9c00c389dff4e56b3da4c' into garux-merge

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

diff --git a/plugins/entity/group.cpp b/plugins/entity/group.cpp
index bad7fc54e793b102a8bcd2caae1f6bd896497b9d..b2c01e9f1f3496d96509c81c4c87968e3023cf12 100644 (file)
--- a/plugins/entity/group.cpp
+++ b/plugins/entity/group.cpp
@@ -63,8 +63,8 @@ NameKeys m_nameKeys;
 OriginKey m_originKey;
 Vector3 m_origin;
 
-RenderableNamedEntity m_renderName;
 mutable Vector3 m_name_origin;
+RenderableNamedEntity m_renderName;
 
 Callback<void()> m_transformChanged;
 Callback<void()> m_evaluateTransform;
@@ -83,8 +83,8 @@ Group( EntityClass* eclass, scene::Node& node, const Callback<void()>& transform
        m_nameKeys( m_entity ),
        m_originKey( OriginChangedCaller( *this ) ),
        m_origin( ORIGINKEY_IDENTITY ),
-       m_renderName( m_named, m_name_origin ),
        m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_transformChanged( transformChanged ),
        m_evaluateTransform( evaluateTransform ){
        construct();
@@ -96,7 +96,8 @@ Group( const Group& other, scene::Node& node, const Callback<void()>& transformC
        m_nameKeys( m_entity ),
        m_originKey( OriginChangedCaller( *this ) ),
        m_origin( ORIGINKEY_IDENTITY ),
-       m_renderName( m_named, g_vector3_identity ),
+       m_name_origin( g_vector3_identity ),
+       m_renderName( m_named, m_name_origin ),
        m_transformChanged( transformChanged ),
        m_evaluateTransform( evaluateTransform ){
        construct();