diff options
| author | Juan Linietsky | 2015-03-22 15:05:47 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-03-22 15:05:47 -0300 |
| commit | f706e3e5d1d93c5666a1edabec1aeee318996d6f (patch) | |
| tree | 6cd00dbb9dcec62343f224fe6a5ae5899232975d /drivers/etc1/rg_etc1.cpp | |
| parent | 0302ea5b821939c68529195d223c35bc7f3ce7b1 (diff) | |
| parent | c0efa3fb5b8c545c34859cc722c3c8a2ada13e02 (diff) | |
| download | godot-f706e3e5d1d93c5666a1edabec1aeee318996d6f.tar.gz godot-f706e3e5d1d93c5666a1edabec1aeee318996d6f.tar.zst godot-f706e3e5d1d93c5666a1edabec1aeee318996d6f.zip | |
Merge pull request #1380 from ElectricSolstice/wparentheses_removal
Changed code to remove gcc -Wparentheses warnings.
Diffstat (limited to 'drivers/etc1/rg_etc1.cpp')
| -rw-r--r-- | drivers/etc1/rg_etc1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/etc1/rg_etc1.cpp b/drivers/etc1/rg_etc1.cpp index cad9af883..63877e6d1 100644 --- a/drivers/etc1/rg_etc1.cpp +++ b/drivers/etc1/rg_etc1.cpp @@ -2367,7 +2367,7 @@ found_perfect_match: int dr = best_results[1].m_block_color_unscaled.r - best_results[0].m_block_color_unscaled.r;
int dg = best_results[1].m_block_color_unscaled.g - best_results[0].m_block_color_unscaled.g;
int db = best_results[1].m_block_color_unscaled.b - best_results[0].m_block_color_unscaled.b;
- RG_ETC1_ASSERT(best_use_color4 || (rg_etc1::minimum(dr, dg, db) >= cETC1ColorDeltaMin) && (rg_etc1::maximum(dr, dg, db) <= cETC1ColorDeltaMax));
+ RG_ETC1_ASSERT(best_use_color4 || ((rg_etc1::minimum(dr, dg, db) >= cETC1ColorDeltaMin) && (rg_etc1::maximum(dr, dg, db) <= cETC1ColorDeltaMax)));
if (best_use_color4)
{
|