From: Dale Weiler <weilercdale@gmail.com>
Date: Sun, 26 Nov 2017 22:48:13 +0000 (-0500)
Subject: Merge branch 'master' of github.com:graphitemaster/gmqcc
X-Git-Tag: xonotic-v0.8.5~29
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=commitdiff_plain;h=1580c23556fea4089acf86462fdf28c281d93397;hp=679e3771de1c016b30bb21da2823e2dc832c2e8a

Merge branch 'master' of github.com:graphitemaster/gmqcc
---

diff --git a/parser.cpp b/parser.cpp
index ddde654..4f7ea69 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -296,7 +296,11 @@ static bool rotate_entfield_array_index_nodes(ast_expression **out)
 static int store_op_for(ast_expression* expr)
 {
     if (OPTS_FLAG(ADJUST_VECTOR_FIELDS) && expr->m_vtype == TYPE_FIELD && expr->m_next->m_vtype == TYPE_VECTOR) {
-        return type_storep_instr[TYPE_VECTOR];
+        if (ast_istype(expr, ast_entfield)) {
+            return type_storep_instr[TYPE_VECTOR];
+        } else {
+            return type_store_instr[TYPE_VECTOR];
+        }
     }
 
     if (ast_istype(expr, ast_member) && ast_istype(((ast_member*)expr)->m_owner, ast_entfield)) {