TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow Shader parameter in ShaderAttrib::make

Browse Source
This commit is contained in:
rdb 2014-07-03 19:14:36 +00:00
parent 0e1f261ca5
commit cc35d0dd41
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
panda/src/pgraph/shaderAttrib.cxx
View File

@ -52,13 +52,18 @@ make_off() {
// set. // set.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
CPT(RenderAttrib) ShaderAttrib:: CPT(RenderAttrib) ShaderAttrib::
make() { make(const Shader *shader) {
static CPT(RenderAttrib) _null_attrib; static CPT(RenderAttrib) _null_attrib;
if (_null_attrib == 0) { if (_null_attrib == 0) {
ShaderAttrib *attrib = new ShaderAttrib; ShaderAttrib *attrib = new ShaderAttrib;
_null_attrib = return_new(attrib); _null_attrib = return_new(attrib);
} }
if (shader == NULL) {
return _null_attrib; return _null_attrib;
} else {
return DCAST(ShaderAttrib, _null_attrib)->set_shader(shader);
}
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

2
panda/src/pgraph/shaderAttrib.h
View File

@ -43,7 +43,7 @@ private:
INLINE ShaderAttrib(const ShaderAttrib &copy); INLINE ShaderAttrib(const ShaderAttrib &copy);
PUBLISHED: PUBLISHED:
static CPT(RenderAttrib) make(); static CPT(RenderAttrib) make(const Shader *shader = NULL);
static CPT(RenderAttrib) make_off(); static CPT(RenderAttrib) make_off();
static CPT(RenderAttrib) make_default(); static CPT(RenderAttrib) make_default();