quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Q3map2:

Browse Source 
* fix crash with nonpthreads xmllib + multithreading + output to system console
	* number of code fixes
Radiant:

misc...
	* fix: clone group ent / map import / saving map as : group ents name labels at 0,0,0;
	* number of code fixes
This commit is contained in:
Garux
2017-08-02 09:00:11 +03:00
parent 3ec33465b1
commit 173f350be7
29 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/entity/doom3group.cpp
View File

@@ -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& transformCha
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& transfor
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 ),