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

dxgsg9: fix compilation error with WeakPointerTo comparison

Browse Source
This commit is contained in:
rdb 2018-07-09 17:09:11 +02:00
parent fbce833aae
commit 55146b9f82
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/dxgsg9/dxGeomMunger9.I
View File

@ -17,14 +17,21 @@
INLINE DXGeomMunger9:: INLINE DXGeomMunger9::
DXGeomMunger9(GraphicsStateGuardian *gsg, const RenderState *state) : DXGeomMunger9(GraphicsStateGuardian *gsg, const RenderState *state) :
StandardMunger(gsg, state, 1, NT_packed_dabc, C_color), StandardMunger(gsg, state, 1, NT_packed_dabc, C_color),
_texture(DCAST(TextureAttrib, state->get_attrib(TextureAttrib::get_class_slot()))), _texture(nullptr),
_tex_gen(DCAST(TexGenAttrib, state->get_attrib(TexGenAttrib::get_class_slot()))) _tex_gen(nullptr)
{ {
const TextureAttrib *texture = nullptr;
const TexGenAttrib *tex_gen = nullptr;
state->get_attrib(texture);
state->get_attrib(tex_gen);
_texture = texture;
_tex_gen = tex_gen;
_filtered_texture = nullptr; _filtered_texture = nullptr;
_reffed_filtered_texture = false; _reffed_filtered_texture = false;
if (_texture != nullptr) { if (texture != nullptr) {
_filtered_texture = _texture->filter_to_max(gsg->get_max_texture_stages()); _filtered_texture = texture->filter_to_max(gsg->get_max_texture_stages());
if (_filtered_texture != _texture) { if (_filtered_texture != texture) {
_filtered_texture->ref(); _filtered_texture->ref();
_reffed_filtered_texture = true; _reffed_filtered_texture = true;
} }