Browse Source

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

rdb 6 years ago
parent
commit
ea10cf192e
3 changed files with 3 additions and 3 deletions
  1. 1 1
      README.md
  2. 1 1
      makepanda/makepanda.py
  3. 1 1
      panda/src/mathutil/boundingBox.I

+ 1 - 1
README.md

@@ -24,7 +24,7 @@ Installing Panda3D
 ==================
 ==================
 
 
 The latest Panda3D SDK can be downloaded from
 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
 If you are familiar with installing Python packages, you can use
 the following comand:
 the following comand:
 
 

+ 1 - 1
makepanda/makepanda.py

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

+ 1 - 1
panda/src/mathutil/boundingBox.I

@@ -101,7 +101,7 @@ get_plane(int n) const {
 INLINE_MATHUTIL void BoundingBox::
 INLINE_MATHUTIL void BoundingBox::
 set_min_max(const LPoint3 &min, const LPoint3 &max) {
 set_min_max(const LPoint3 &min, const LPoint3 &max) {
   nassertv(!min.is_nan() && !max.is_nan());
   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;
   _min = min;
   _max = max;
   _max = max;
   _flags = 0;
   _flags = 0;