Merge commit '6592d65469e5386216a692ba3b5d6e7cc590c617' into garux-merge

[xonotic/netradiant.git] / radiant / entity.cpp

diff --git a/radiant/entity.cpp b/radiant/entity.cpp
index 7a72183666cbc42f04bf8c1ed8a4f4bb705c8db4..c555715cc2fccf995b03214518fa4fa83fe907e1 100644 (file)
--- a/radiant/entity.cpp
+++ b/radiant/entity.cpp
@@ -309,7 +309,7 @@ void Entity_createFromSelection( const char* name, const Vector3& origin ){
 
        bool isModel = ( string_compare_nocase_n( name, "misc_", 5 ) == 0 && string_equal_nocase( name + string_length( name ) - 5, "model" ) ) // misc_*model (also misc_model)
                                   || string_equal_nocase( name, "model_static" )
-                                  || ( GlobalSelectionSystem().countSelected() == 0 && string_equal_nocase( name, "func_static" ) );
+                                  || ( GlobalSelectionSystem().countSelected() == 0 && string_equal_nocase( name, "func_static" ) && g_pGameDescription->mGameType == "doom3" );
 
        bool brushesSelected = Scene_countSelectedBrushes( GlobalSceneGraph() ) != 0;
 
@@ -401,7 +401,7 @@ void Entity_createFromSelection( const char* name, const Vector3& origin ){
        }
 
        if ( string_compare_nocase_n( name, "trigger_", 8 ) == 0 && brushesSelected ){
-               const char* shader = g_pGameDescription->getKeyValue( "trigger_shader" );
+               const char* shader = g_pGameDescription->getKeyValue( "shader_trigger" );
                if ( shader && *shader ){
                        Scene_PatchSetShader_Selected( GlobalSceneGraph(), shader );
                        Scene_BrushSetShader_Selected( GlobalSceneGraph(), shader );