jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs/graphics: Change BorderColor to just use number 

Instead of prefixing the color with the '#' character, just take it as
an actual integer.
master
jp9000 2016-06-28 02:31:09 -07:00
parent d5e2cdf4d3
commit a90c37987f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libobs/graphics/shader-parser.c
View File

@ -119,8 +119,7 @@ void shader_sampler_convert(struct shader_sampler *ss,
else if (astrcmpi(state, "MaxAnisotropy") == 0) else if (astrcmpi(state, "MaxAnisotropy") == 0)
info->max_anisotropy = (int)strtol(value, NULL, 10); info->max_anisotropy = (int)strtol(value, NULL, 10);
else if (astrcmpi(state, "BorderColor") == 0) else if (astrcmpi(state, "BorderColor") == 0)
info->border_color = (*value == '#') ? info->border_color = strtol(value + 1, NULL, 16);
strtol(value + 1, NULL, 16) : 0;
} }
} }
@ -138,7 +137,7 @@ static int sp_parse_sampler_state_item(struct shader_parser *sp,
ret = cf_next_token_should_be(&sp->cfp, "=", ";", NULL); ret = cf_next_token_should_be(&sp->cfp, "=", ";", NULL);
if (ret != PARSE_SUCCESS) goto fail; if (ret != PARSE_SUCCESS) goto fail;
ret = cf_next_name(&sp->cfp, &value, "value name", ";"); ret = cf_next_token_copy(&sp->cfp, &value);
if (ret != PARSE_SUCCESS) goto fail; if (ret != PARSE_SUCCESS) goto fail;
ret = cf_next_token_should_be(&sp->cfp, ";", ";", NULL); ret = cf_next_token_should_be(&sp->cfp, ";", ";", NULL);