From a760c2ba4f0ce12ad393316e107ae0a1a1fc8623 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 12 May 2008 23:32:49 +0000 Subject: [PATCH] initialize flags --- panda/src/pgraph/shaderAttrib.I | 4 +++- panda/src/pgraph/shaderAttrib.cxx | 11 ----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/panda/src/pgraph/shaderAttrib.I b/panda/src/pgraph/shaderAttrib.I index 0bb88f99f0..1f0e64e6df 100755 --- a/panda/src/pgraph/shaderAttrib.I +++ b/panda/src/pgraph/shaderAttrib.I @@ -27,7 +27,9 @@ ShaderAttrib() : _shader(NULL), _shader_priority(0), _auto_shader(false), - _has_shader(false) + _has_shader(false), + _flags(0), + _has_flags(0) { } diff --git a/panda/src/pgraph/shaderAttrib.cxx b/panda/src/pgraph/shaderAttrib.cxx index 8e6e54092f..140768bf47 100755 --- a/panda/src/pgraph/shaderAttrib.cxx +++ b/panda/src/pgraph/shaderAttrib.cxx @@ -40,12 +40,7 @@ make_off() { static CPT(RenderAttrib) _off_attrib; if (_off_attrib == 0) { ShaderAttrib *attrib = new ShaderAttrib; - attrib->_shader = (Shader*)NULL; - attrib->_shader_priority = 0; - attrib->_auto_shader = false; attrib->_has_shader = true; - attrib->_flags = 0; - attrib->_has_flags = 0; _off_attrib = return_new(attrib); } return _off_attrib; @@ -62,12 +57,6 @@ make() { static CPT(RenderAttrib) _null_attrib; if (_null_attrib == 0) { ShaderAttrib *attrib = new ShaderAttrib; - attrib->_shader = (Shader*)NULL; - attrib->_shader_priority = 0; - attrib->_auto_shader = false; - attrib->_has_shader = false; - attrib->_flags = 0; - attrib->_has_flags = 0; _null_attrib = return_new(attrib); } return _null_attrib;