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

get_text() should return a reference

Browse Source
This commit is contained in:
David Rose 2010-03-10 20:26:18 +00:00
parent 2e9cf84f88
commit e972a6dd0b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/gobj/shader.I
View File

@ -45,10 +45,10 @@ get_filename(const ShaderType &type) const {
// Access: Public // Access: Public
// Description: Return the Shader's text for the given shader type. // Description: Return the Shader's text for the given shader type.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const string Shader:: INLINE const string &Shader::
get_text(const ShaderType &type) const { get_text(const ShaderType &type) const {
if (_text->_separate) { if (_text->_separate) {
nassertr(type != ST_none || !_text->_shared.empty(), ""); nassertr(type != ST_none || !_text->_shared.empty(), _text->_shared);
switch (type) { switch (type) {
case ST_vertex: case ST_vertex:
return _text->_vertex; return _text->_vertex;

2
panda/src/gobj/shader.h
View File

@ -56,7 +56,7 @@ PUBLISHED:
static PT(Shader) make(const ShaderLanguage &lang, const string &vertex, const string &fragment, const string &geometry = ""); static PT(Shader) make(const ShaderLanguage &lang, const string &vertex, const string &fragment, const string &geometry = "");
INLINE const Filename get_filename(const ShaderType &type = ST_none) const; INLINE const Filename get_filename(const ShaderType &type = ST_none) const;
INLINE const string get_text(const ShaderType &type = ST_none) const; INLINE const string &get_text(const ShaderType &type = ST_none) const;
INLINE const bool get_error_flag() const; INLINE const bool get_error_flag() const;
INLINE const ShaderLanguage get_language() const; INLINE const ShaderLanguage get_language() const;