From a90c37987ffc04264fbefa1276f3a10aaca39acb Mon Sep 17 00:00:00 2001 From: jp9000 Date: Tue, 28 Jun 2016 02:31:09 -0700 Subject: [PATCH] libobs/graphics: Change BorderColor to just use number Instead of prefixing the color with the '#' character, just take it as an actual integer. --- libobs/graphics/shader-parser.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libobs/graphics/shader-parser.c b/libobs/graphics/shader-parser.c index 2d852bdd2..6771d4ce2 100644 --- a/libobs/graphics/shader-parser.c +++ b/libobs/graphics/shader-parser.c @@ -119,8 +119,7 @@ void shader_sampler_convert(struct shader_sampler *ss, else if (astrcmpi(state, "MaxAnisotropy") == 0) info->max_anisotropy = (int)strtol(value, NULL, 10); else if (astrcmpi(state, "BorderColor") == 0) - info->border_color = (*value == '#') ? - strtol(value + 1, NULL, 16) : 0; + info->border_color = strtol(value + 1, NULL, 16); } } @@ -138,7 +137,7 @@ static int sp_parse_sampler_state_item(struct shader_parser *sp, ret = cf_next_token_should_be(&sp->cfp, "=", ";", NULL); 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; ret = cf_next_token_should_be(&sp->cfp, ";", ";", NULL);