comparison: src/glCompiler.cpp
src/glCompiler.cpp
- changeset 1017
- fc1c13db9618
- parent 1014
- f0a8ecb6a357
- child 1023
- 9450ac3cd930
equal
deleted
inserted
replaced
| 1016:3b279b5e57d3 | 1017:fc1c13db9618 |
|---|---|
| 143 else | 143 else |
| 144 qcol = topobj->color().faceColor(); | 144 qcol = topobj->color().faceColor(); |
| 145 } | 145 } |
| 146 else if (poly.color == EdgeColor) | 146 else if (poly.color == EdgeColor) |
| 147 { | 147 { |
| 148 qcol = luma (QColor (Config->backgroundColor())) > 40 ? Qt::black : Qt::white; | 148 qcol = luma (QColor (m_config->backgroundColor())) > 40 ? Qt::black : Qt::white; |
| 149 } | 149 } |
| 150 else | 150 else |
| 151 { | 151 { |
| 152 LDColor col = poly.color; | 152 LDColor col = poly.color; |
| 153 | 153 |
| 184 else if (topobj == m_renderer->objectAtCursor()) | 184 else if (topobj == m_renderer->objectAtCursor()) |
| 185 blendAlpha = 0.5; | 185 blendAlpha = 0.5; |
| 186 | 186 |
| 187 if (blendAlpha != 0.0) | 187 if (blendAlpha != 0.0) |
| 188 { | 188 { |
| 189 QColor selcolor (Config->selectColorBlend()); | 189 QColor selcolor (m_config->selectColorBlend()); |
| 190 double denom = blendAlpha + 1.0; | 190 double denom = blendAlpha + 1.0; |
| 191 qcol.setRed ((qcol.red() + (selcolor.red() * blendAlpha)) / denom); | 191 qcol.setRed ((qcol.red() + (selcolor.red() * blendAlpha)) / denom); |
| 192 qcol.setGreen ((qcol.green() + (selcolor.green() * blendAlpha)) / denom); | 192 qcol.setGreen ((qcol.green() + (selcolor.green() * blendAlpha)) / denom); |
| 193 qcol.setBlue ((qcol.blue() + (selcolor.blue() * blendAlpha)) / denom); | 193 qcol.setBlue ((qcol.blue() + (selcolor.blue() * blendAlpha)) / denom); |
| 194 } | 194 } |
