Merge branch 'master' into blub/bc3

diff --combined ast.h
index ce56cc235b0e9a30427b9431d572819eb4f37857,187ec882cb8093dc6f09d24374be9fa0944012e5..3dc30b2221c4c278906eb3a076ff7bbb934a1d13
--- 1/ast.h
--- 2/ast.h
+++ b/ast.h
@@@ -111,8 -111,6 +111,8 @@@ struct ast_value_
          const char   *vstring;
          int           ventity;
          ast_function *vfunc;
 +        quaternion    vquat;
 +        matrix        vmat;
      } constval;
  
      ir_value *ir_v;
@@@ -398,13 -396,6 +398,6 @@@ struct ast_function_
      char         labelbuf[64];
  
      MEM_VECTOR_MAKE(ast_block*, blocks);
- 
-     /* contrary to the params in ast_value, these are the parameter variables
-      * which are to be used in expressions.
-      * The ast_value for the function contains only the parameter types used
-      * to generate ast_calls, and ast_call contains the parameter values
-      * used in that call.
-      */
  };
  ast_function* ast_function_new(lex_ctx ctx, const char *name, ast_value *vtype);
  /* This will NOT delete the underlying ast_value */