diff --git a/README.md b/README.md index 314ed49ff5..9630c06df0 100644 --- a/README.md +++ b/README.md @@ -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: diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index e7d12ce4d6..4cd0600622 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -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']) diff --git a/panda/src/mathutil/boundingBox.I b/panda/src/mathutil/boundingBox.I index 2bb67a500e..f0b12f8dfd 100644 --- a/panda/src/mathutil/boundingBox.I +++ b/panda/src/mathutil/boundingBox.I @@ -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;