Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / plugins / mapq3 / write.cpp

diff --git a/plugins/mapq3/write.cpp b/plugins/mapq3/write.cpp
index 4bfbbe78da0097a8d8974a4c658ac32b7eb0767f..cbf0ec05140334b31be28215bee76a8c1cbb84ce 100644 (file)
--- a/plugins/mapq3/write.cpp
+++ b/plugins/mapq3/write.cpp
@@ -72,6 +72,10 @@ bool pre( scene::Node &node ) const {
 
        Entity* entity = Node_getEntity( node );
        if ( entity != 0 ) {
+               if( entity->isContainer() && Node_getTraversable( node )->empty() && !string_equal( entity->getKeyValue( "classname" ), "worldspawn" ) ){
+                       globalErrorStream() << "discarding empty group entity: # = " << g_count_entities << "; classname = " << entity->getKeyValue( "classname" ) << "\n";
+                       return false;
+               }
                if ( m_writeComments ) {
                        m_writer.writeToken( "//" );
                        m_writer.writeToken( "entity" );