WebGL's makeup lipsColor overridden by skinColor's lipsColor

Firstly, big thanks to all of you contributors, especially Eloheim! Your work on this project is very much appreciated.

I've encountered a bug where the webGL's image/art lip color is not being changed by applying makeup. I believe I've identified the possible cause, including the merge/commit/variable.

Expected Behavior

Applying makeup should change the lip/lipstick color based on the selected makeup type.

Current Behavior

Lip color is unchanged by makeup selection, and instead is only based off skin color. Metalic/Neon does add a tint/overlay, but don't change the color.

Possible Cause

It looks like the skin-based "lipsColor =" is overriding the makeup-based lipsColor.

See Commit 8daf58a3, line 1569

Possible Fix

Perhaps the skin-based lipsColor formula should only be applied if not wearing makeup. Or perhaps the skin-based lipsColor should use a different variable specific to the default/original lipsColor (like oLipsColor? is the "o" in oSkinColors "original"?).

Using the following if() fixed it for me, but unsure if this is the best solution.

	if (slave.makeup == 0) {
		lipsColor = [O[0]*0.76*lbrf, O[1]*0.55*lbrf, O[2]*0.6*lbrf];
	}

Additional information

Edit: wrap the if within a multi line code tag, with examples for both single and multi line code block(s).
image

Edited by Blank_Alt