ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed doom3 func_static creation bugs

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@94 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
spog 2006-07-22 15:24:20 +00:00
parent e87a0b240c
commit 988b2f6fbc
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -6,6 +6,8 @@ SPoG
- Fixed doom3 func_static with model not appearing to move when dragged. - Fixed doom3 func_static with model not appearing to move when dragged.
- Changed ASE model loader to parse material names the same way as DoomEdit. - Changed ASE model loader to parse material names the same way as DoomEdit.
- Fixed title of wait-dialog when loading a model. - Fixed title of wait-dialog when loading a model.
- Fixed doom3 func_static with blank 'model' key being invisible.
- Changed doom3 func_static model creation to replace selected models.
09/07/2006 09/07/2006
Shaderman Shaderman

2
plugins/entity/doom3group.cpp
View file

@ -198,7 +198,7 @@ private:
void updateIsModel() void updateIsModel()
{ {
setIsModel(!string_empty(m_modelKey.c_str()) && !string_equal(m_modelKey.c_str(), m_name.c_str())); setIsModel(!string_equal(m_modelKey.c_str(), m_name.c_str()));
} }
void nameChanged(const char* value) void nameChanged(const char* value)

8
radiant/entity.cpp
View file

@ -246,7 +246,7 @@ void Entity_createFromSelection(const char* name, const Vector3& origin)
entitypath.push(makeReference(node.get())); entitypath.push(makeReference(node.get()));
scene::Instance& instance = findInstance(entitypath); scene::Instance& instance = findInstance(entitypath);
if(entityClass->fixedsize) if(entityClass->fixedsize || (isModel && !brushesSelected))
{ {
Select_Delete(); Select_Delete();
@ -264,13 +264,13 @@ void Entity_createFromSelection(const char* name, const Vector3& origin)
} }
else else
{ {
Scene_parentSelectedBrushesToEntity(GlobalSceneGraph(), node);
Scene_forEachChildSelectable(SelectableSetSelected(true), instance.path());
if (g_pGameDescription->mGameType == "doom3") if (g_pGameDescription->mGameType == "doom3")
{ {
Node_getEntity(node)->setKeyValue("model", Node_getEntity(node)->getKeyValue("name")); Node_getEntity(node)->setKeyValue("model", Node_getEntity(node)->getKeyValue("name"));
} }
Scene_parentSelectedBrushesToEntity(GlobalSceneGraph(), node);
Scene_forEachChildSelectable(SelectableSetSelected(true), instance.path());
} }
// tweaking: when right clic dropping a light entity, ask for light value in a custom dialog box // tweaking: when right clic dropping a light entity, ask for light value in a custom dialog box