MAINT-3399 Hairbase renders incorrectly in edit appearance mode

Wed, 07 Mar 2018 17:26:51 +0200

author
maxim_productengine<mnikolenko@productengine.com>
date
Wed, 07 Mar 2018 17:26:51 +0200
changeset 55329
005206c5c001
parent 55328
1d9ad7f485e6
child 55330
d28612dea27b

MAINT-3399 Hairbase renders incorrectly in edit appearance mode

indra/newview/llvoavatar.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llvoavatar.cpp	Tue Mar 06 16:23:29 2018 +0200
     1.2 +++ b/indra/newview/llvoavatar.cpp	Wed Mar 07 17:26:51 2018 +0200
     1.3 @@ -7366,13 +7366,11 @@
     1.4  			debugColorizeSubMeshes(i,LLColor4::blue);
     1.5  		}
     1.6  	}
     1.7 -	static LLUUID default_alpha_uuid = LLUUID(gSavedSettings.getString("UIImgDefaultAlphaUUID"));
     1.8 -	bool hair_alpha_exists = (getImage(TEX_HAIR_ALPHA, 0) && getImage(TEX_HAIR_ALPHA, 0)->getID() != default_alpha_uuid);
     1.9  
    1.10  	// set texture and color of hair manually if we are not using a baked image.
    1.11  	// This can happen while loading hair for yourself, or for clients that did not
    1.12  	// bake a hair texture. Still needed for yourself after 1.22 is depricated.
    1.13 -	if (!is_layer_baked[BAKED_HAIR] || (isEditingAppearance() && !hair_alpha_exists))
    1.14 +	if (!is_layer_baked[BAKED_HAIR])
    1.15  	{
    1.16  		const LLColor4 color = mTexHairColor ? mTexHairColor->getColor() : LLColor4(1,1,1,1);
    1.17  		LLViewerTexture* hair_img = getImage( TEX_HAIR, 0 );

mercurial