blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Fix T45086: Crash showing scopes 

Was a rounding issue, which was previously solved by quite simple check.
Well, let's do the same check again :)
This commit is contained in:
Sergey Sharybin 2015-06-15 22:17:16 +02:00
parent 1c707a2392
commit 6c23497185
Notes: blender-bot 2023-02-14 09:00:19 +01:00 
Referenced by issue #45086, Crash showing scopes
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/colortools.c
View File

@ -1135,7 +1135,8 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, const ColorManagedViewSettings *
#endif
const float *rf = NULL;
const unsigned char *rc = NULL;
const bool do_sample_line = (y % rows_per_sample_line) == 0;
const int savedlines = y / rows_per_sample_line;
const bool do_sample_line = (savedlines < scopes->sample_lines) && (y % rows_per_sample_line) == 0;
float min[3] = { FLT_MAX, FLT_MAX, FLT_MAX},
max[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
int x, c;
@ -1183,7 +1184,6 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, const ColorManagedViewSettings *
/* save sample if needed */
if (do_sample_line) {
const float fx = (float)x / (float)ibuf->x;
const int savedlines = y / rows_per_sample_line;
const int idx = 2 * (ibuf->x * savedlines + x);
save_sample_line(scopes, idx, fx, rgba, ycc);
}