From 08b2046cfb40190f5b6f726ce3f1762150d4e7ad Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 11 Mar 2019 01:11:14 +0100 Subject: [PATCH 1/4] readme: update download link to 1.10.2 SDK [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c4de7903d..3a897f87ec 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: From bafd523e2b70694bba3419e7bb0b9e81587bbca6 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 12 Mar 2019 15:36:47 +0100 Subject: [PATCH 2/4] mathutil: fix bad assert in BoundingBox::set_min_max --- panda/src/mathutil/boundingBox.I | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From a8ceac919a703d5836f1613fa848278511211fa1 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 12 Mar 2019 18:08:04 +0100 Subject: [PATCH 3/4] Raise version number to 1.10.3 on release/1.10.x branch --- dtool/PandaVersion.pp | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dtool/PandaVersion.pp b/dtool/PandaVersion.pp index aaaa302239..0790cf912c 100644 --- a/dtool/PandaVersion.pp +++ b/dtool/PandaVersion.pp @@ -7,7 +7,7 @@ // place to put this. // Use spaces to separate the major, minor, and sequence numbers here. -#define PANDA_VERSION 1 10 2 +#define PANDA_VERSION 1 10 3 // This variable will be defined to false in the CVS repository, but // scripts that generate source tarballs and/or binary releases for diff --git a/setup.cfg b/setup.cfg index 09a266fc76..9ea2c42e68 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = Panda3D -version = 1.10.2 +version = 1.10.3 url = https://www.panda3d.org/ description = Panda3D is a framework for 3D rendering and game development for Python and C++ programs. license = Modified BSD License From 915e290513d023bba718d68ce01d1a8299e7803e Mon Sep 17 00:00:00 2001 From: Sebastian Hoffmann Date: Tue, 12 Mar 2019 18:00:56 +0100 Subject: [PATCH 4/4] makepanda: expose save_egg_file/save_egg_data to Python Closes #582 --- makepanda/makepanda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index aeaa09585d..5d140f939c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4751,7 +4751,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'])