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

ShaderGenerator: fix TextureAttrib assertion

Browse Source 
This was caused by af57c829d2c15530f72395895353c004a7440a35 and was triggered by a change in TextureStage sort.
This commit is contained in:
rdb 2017-06-22 13:36:23 +02:00
parent 511b0c10e5
commit 9c4151cb0f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/pgraph/textureAttrib.I
View File

@ -263,7 +263,7 @@ on_stage_affects_alpha(size_t n) const {
*/ */
INLINE void TextureAttrib:: INLINE void TextureAttrib::
check_sorted() const { check_sorted() const {
if (_sort_seq != TextureStage::get_sort_seq()) { if (_sort_seq != TextureStage::get_sort_seq() && !_sort_seq.is_fresh()) {
((TextureAttrib *)this)->sort_on_stages(); ((TextureAttrib *)this)->sort_on_stages();
} }
} }

3
panda/src/pgraph/textureAttrib.cxx
View File

@ -807,6 +807,9 @@ get_auto_shader_attrib_impl(const RenderState *state) const {
} }
} }
// Prevent check_sorted() from being called on this state.
attrib->_sort_seq = UpdateSeq::fresh();
return return_new(attrib); return return_new(attrib);
} }