From 902c4aa1e91f3347dab7ca9414e43dc037a6c520 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 15 Jul 2011 08:45:54 +0000 Subject: [PATCH] From Ryan Pavlik, Merged from svn/trunk revision 12686. "Fix inventor state copy constructor. Clang warning: In file included from src/osgPlugins/Inventor/ConvertToInventor.cpp:80: src/osgPlugins/Inventor/ConvertToInventor.h:117:71: warning: field is uninitialized when used here [-Wuninitialized] osgTexGenS(s.osgTexGenS), osgTexGenT(s.osgTexGenT), osgTexGen(osgTexGen), ^" --- src/osgPlugins/Inventor/ConvertToInventor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/Inventor/ConvertToInventor.h b/src/osgPlugins/Inventor/ConvertToInventor.h index 46e9875d1..d057ff433 100644 --- a/src/osgPlugins/Inventor/ConvertToInventor.h +++ b/src/osgPlugins/Inventor/ConvertToInventor.h @@ -114,7 +114,7 @@ protected: InventorState(const InventorState &s) : ivHead(s.ivHead), ivTexture(s.ivTexture), ivMaterial(s.ivMaterial), osgMaterial(s.osgMaterial), osgTexture2Enabled(s.osgTexture2Enabled), osgTexture(s.osgTexture), osgTexEnv(s.osgTexEnv), - osgTexGenS(s.osgTexGenS), osgTexGenT(s.osgTexGenT), osgTexGen(osgTexGen), + osgTexGenS(s.osgTexGenS), osgTexGenT(s.osgTexGenT), osgTexGen(s.osgTexGen), osgLighting(s.osgLighting), osgTwoSided(s.osgTwoSided), osgFrontFace(s.osgFrontFace), osgCullFaceEnabled(s.osgCullFaceEnabled), osgCullFace(s.osgCullFace), osgBlendEnabled(s.osgBlendEnabled), osgBlendFunc(s.osgBlendFunc) {}