diff options
| author | Christian König <[email protected]> | 2011-06-05 00:11:41 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-05 00:11:41 +0200 |
| commit | 1eb957bb4108123bea95b818e0544e3b5f255e08 (patch) | |
| tree | d7febd8e6cc841ab16dca53f031322ec47d5ccd9 /src/glsl/glsl_parser_extras.cpp | |
| parent | a6c76c8a90dc8995feed3c61b02dbd8408149036 (diff) | |
| parent | 6491e9593d5cbc5644eb02593a2f562447efdcbb (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Diffstat (limited to 'src/glsl/glsl_parser_extras.cpp')
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index fce2faa758b..d9aa300bbe4 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/src/glsl/glsl_parser_extras.cpp @@ -436,7 +436,7 @@ ast_expression::print(void) const printf("? "); subexpressions[1]->print(); printf(": "); - subexpressions[1]->print(); + subexpressions[2]->print(); break; case ast_array_index: |