From 6f782ce519766206a71f8e9ba235bcaeebca8d45 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 8 Jan 2020 03:30:27 +0100 Subject: [PATCH 1/4] pnmimage: don't return values larger than 1.0f from from_val() --- panda/src/pnmimage/pnmImage.I | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/pnmimage/pnmImage.I b/panda/src/pnmimage/pnmImage.I index a82e6d6eda..07862ab40a 100644 --- a/panda/src/pnmimage/pnmImage.I +++ b/panda/src/pnmimage/pnmImage.I @@ -210,7 +210,7 @@ from_val(xelval input_value) const { switch (_xel_encoding) { case XE_generic: case XE_generic_alpha: - return (float)input_value * _inv_maxval; + return std::min((float)input_value * _inv_maxval, 1.0f); case XE_generic_sRGB: case XE_generic_sRGB_alpha: From da0fe8be3eb91873e73a04b552b968a42ccabbdc Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 8 Jan 2020 04:15:52 +0100 Subject: [PATCH 2/4] readme: change link to 1.10.5 release [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 375982711e..5a5f801f35 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-4-1/). +[this page](https://www.panda3d.org/download/sdk-1-10-5/). If you are familiar with installing Python packages, you can use the following comand: From 2fd703af6c9343c5944a7ab482b44b6dfe98aade Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 13 Jan 2020 15:02:36 +0100 Subject: [PATCH 3/4] makepanda: fix using Windows 8.1 SDK (which also requires UCRT) --- makepanda/makepandacore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 01a50199a7..d26bbeed9d 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -2843,8 +2843,8 @@ def SetupVisualStudioEnviron(): exit("Could not locate 64-bits libraries in Windows SDK directory!\nUsing directory: %s" % SDK["MSPLATFORM"]) # Targeting the 7.1 SDK (which is the only way to have Windows XP support) - # with Visual Studio 2015 requires use of the Universal CRT. - if winsdk_ver in ('7.1', '7.1A') and SDK["VISUALSTUDIO_VERSION"] >= (14,0): + # with Visual Studio 2015+ requires use of the Universal CRT. + if winsdk_ver in ('7.1', '7.1A', '8.0', '8.1') and SDK["VISUALSTUDIO_VERSION"] >= (14,0): win_kit = GetRegistryKey("SOFTWARE\\Microsoft\\Windows Kits\\Installed Roots", "KitsRoot10") # Fallback in case we can't read the registry. From 2960ae60e2d8cf4c982ebea3d19cb084b834d5e4 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 13 Jan 2020 15:04:44 +0100 Subject: [PATCH 4/4] Bump version number on release/1.10.x branch to 1.10.6 [skip ci] --- 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 46200cdd27..2d8cfa3991 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 5 +#define PANDA_VERSION 1 10 6 // 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 f72764f692..179c63b4cb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = Panda3D -version = 1.10.5 +version = 1.10.6 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