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

Fix Windows compile error: MSVC doesn't like variables named "near" and "far"

Browse Source
This commit is contained in:
rdb 2015-12-08 18:55:27 +01:00
parent 25451feb87
commit 66861f137f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/display/graphicsStateGuardian.cxx
View File

@ -1158,9 +1158,9 @@ fetch_specified_part(Shader::ShaderMatInput part, InternalName *name,
get_scene()->get_world_transform()->get_mat(); get_scene()->get_world_transform()->get_mat();
LVecBase3 p = (t.xform_point(lt->get_point())); LVecBase3 p = (t.xform_point(lt->get_point()));
LVecBase3 a = lt->get_attenuation(); LVecBase3 a = lt->get_attenuation();
PN_stdfloat near = lt->get_lens(0)->get_near(); PN_stdfloat lnear = lt->get_lens(0)->get_near();
PN_stdfloat far = lt->get_lens(0)->get_far(); PN_stdfloat lfar = lt->get_lens(0)->get_far();
t = LMatrix4(c[0],c[1],c[2],c[3],s[0],s[1],s[2],s[3],p[0],p[1],p[2],near,a[0],a[1],a[2],far); t = LMatrix4(c[0],c[1],c[2],c[3],s[0],s[1],s[2],s[3],p[0],p[1],p[2],lnear,a[0],a[1],a[2],lfar);
return &t; return &t;
} }
case Shader::SMO_slight_x: { case Shader::SMO_slight_x: {