diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:31:02 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:31:02 (GMT) |
| commit | 133a705feef86f11d5afc7fb69ed30585db9e533 (patch) | |
| tree | f886e81c8853cdc1b26f557ad435e78c3c347a6b /src/OpenCSGRenderer.cc | |
| parent | eb79c56ece95f5508e9ee12326995a84a1f9a5f2 (diff) | |
| parent | b927e9e1511ca655b4c15b003343ddffc08b0938 (diff) | |
merging
Merge remote branch 'upstream/master' into visitortests
Conflicts:
src/cgaladv.cc
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
Diffstat (limited to 'src/OpenCSGRenderer.cc')
| -rw-r--r-- | src/OpenCSGRenderer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc index 6cbe849..3052c77 100644 --- a/src/OpenCSGRenderer.cc +++ b/src/OpenCSGRenderer.cc @@ -92,7 +92,7 @@ void OpenCSGRenderer::renderCSGChain(CSGChain *chain, GLint *shaderinfo, chain->polysets[j]->render_surface(PolySet::COLORMODE_HIGHLIGHT, PolySet::csgmode_e(csgmode + 20), m, shaderinfo); } else if (background) { chain->polysets[j]->render_surface(PolySet::COLORMODE_BACKGROUND, PolySet::csgmode_e(csgmode + 10), m, shaderinfo); - } else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0 || m[19] >= 0) { + } else if (m[16] >= 0 || m[17] >= 0 || m[18] >= 0) { // User-defined color from source glColor4d(m[16], m[17], m[18], m[19]); if (shaderinfo) { |