RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more fixes to alpha-scale-via-texture

This commit is contained in:
David Rose 2006-10-11 22:42:16 +00:00
parent caa7b9404d
commit f8864484ca
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -2179,13 +2179,11 @@ set_state_and_transform(const RenderState *target,
_state._clip_plane = _target._clip_plane;
}
if (_target._color != _state._color) {
if (_target._color != _state._color ||
_target._color_scale != _state._color_scale) {
do_issue_color();
_state._color = _target._color;
}
if (_target._color_scale != _state._color_scale) {
do_issue_color_scale();
_state._color = _target._color;
_state._color_scale = _target._color_scale;
}

8
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -3234,13 +3234,11 @@ set_state_and_transform(const RenderState *target,
_state._clip_plane = _target._clip_plane;
}
if (_target._color != _state._color) {
if (_target._color != _state._color ||
_target._color_scale != _state._color_scale) {
do_issue_color();
_state._color = _target._color;
}
if (_target._color_scale != _state._color_scale) {
do_issue_color_scale();
_state._color = _target._color;
_state._color_scale = _target._color_scale;
}

8
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -5607,13 +5607,11 @@ set_state_and_transform(const RenderState *target,
_state._clip_plane = _target._clip_plane;
}
if (_target._color != _state._color) {
if (_target._color != _state._color ||
_target._color_scale != _state._color_scale) {
do_issue_color();
_state._color = _target._color;
}
if (_target._color_scale != _state._color_scale) {
do_issue_color_scale();
_state._color = _target._color;
_state._color_scale = _target._color_scale;
}