TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/1.10.x'

Browse Source
This commit is contained in:
rdb 2019-03-12 21:11:56 +01:00
commit ea10cf192e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -24,7 +24,7 @@ Installing Panda3D
==================
The latest Panda3D SDK can be downloaded from
[this page](https://www.panda3d.org/download/sdk-1-10-1/).
[this page](https://www.panda3d.org/download/sdk-1-10-2/).
If you are familiar with installing Python packages, you can use
the following comand:

2
makepanda/makepanda.py
View File

@ -4709,7 +4709,7 @@ if not RUNTIME and not PkgSkip("EGG"):
TargetAdd('p3egg2pg_composite2.obj', opts=OPTS, input='p3egg2pg_composite2.cxx')
OPTS=['DIR:panda/src/egg2pg']
IGATEFILES=['load_egg_file.h']
IGATEFILES=['load_egg_file.h', 'save_egg_file.h']
TargetAdd('libp3egg2pg.in', opts=OPTS, input=IGATEFILES)
TargetAdd('libp3egg2pg.in', opts=['IMOD:panda3d.egg', 'ILIB:libp3egg2pg', 'SRCDIR:panda/src/egg2pg'])

2
panda/src/mathutil/boundingBox.I
View File

@ -101,7 +101,7 @@ get_plane(int n) const {
INLINE_MATHUTIL void BoundingBox::
set_min_max(const LPoint3 &min, const LPoint3 &max) {
nassertv(!min.is_nan() && !max.is_nan());
nassertv(_min[0] <= _max[0] && _min[1] <= _max[1] && _min[2] <= _max[2]);
nassertv(min[0] <= max[0] && min[1] <= max[1] && min[2] <= max[2]);
_min = min;
_max = max;
_flags = 0;