Merge branch 'bones_was_here/csqc_bmodels' into 'master'

triggers: set bmodel correctly in CSQC

See merge request xonotic/xonotic-data.pk3dir!1237

diff --git a/qcsrc/common/mapobjects/triggers.qc b/qcsrc/common/mapobjects/triggers.qc
index 5fc5f4f3fb1bea0af0fc09682ab7b6196e857aeb..cfc1d6fac67f6222162c444e665f2dd31133b443 100644 (file)
--- a/qcsrc/common/mapobjects/triggers.qc
+++ b/qcsrc/common/mapobjects/triggers.qc
@@ -205,6 +205,8 @@ void trigger_common_read(entity this, bool withtarget)
                this.angles = '0 0 0';
 
        this.modelindex = ReadShort();
+       if (this.modelindex)
+               setmodelindex(this, this.modelindex);
        this.mins = ReadVector();
        this.maxs = ReadVector();
        this.scale = ReadByte() / 16;