Merge

code/nel/src/3d/driver/opengl/driver_opengl.cpp

@@ -559,6 +559,8 @@ bool CDriverGL::setupDisplay()
 	// meaning that light direction is always (0,1,0) in eye-space
 	// use enableLighting(0....), to get normal behaviour
 	_DriverGLStates.enableLight(0, true);
+	_LightMode[0] = CLight::DirectionalLight;
+	_WorldLightDirection[0] = CVector::Null;
 
 	_Initialized = true;
 

code/ryzom/client/src/interface_v3/character_3d.cpp

@@ -71,6 +71,7 @@ SCharacter3DSetup::SCharacter3DSetup ()
 	}
 	Tattoo = 0;
 	EyesColor = 0;
+	HairColor = 0;
 	CharHeight = 0.0f;
 	ChestWidth = 0.0f;
 	ArmsWidth = 0.0f;