From c2ea3fa49ff74b3061319bf85fb8e5850cc942ce Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Sat, 22 Jan 2022 09:12:43 -0800 Subject: [PATCH 1/2] fix build --- Engine/Node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/Node.cpp b/Engine/Node.cpp index a99c06b7f7..dc51cf2adf 100644 --- a/Engine/Node.cpp +++ b/Engine/Node.cpp @@ -3164,7 +3164,7 @@ renderPreview(const Image & srcImg, bool convertToSrgb, unsigned int* dstPixels) { -#ifndef DEBUG_NAN +#if defined(DEBUG) && !defined(DEBUG_NAN) // Some plugins generate FP exceptions boost_adaptbx::floating_point::exception_trapping trap(0); #endif From 8be162478aef9962265c702fc2b2053f58b4fa97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9?= Date: Sat, 22 Jan 2022 21:26:42 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2969e413..461eb2522f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ### Changes +- Added palette support in color selector. #754 - Allow creating a node with the same name that was just deleted. #732 - Natron can now keep up to 32 project backups (see Preferences/General/Save versions). #562 - Only display the overlays for nodes that are in the viewer render path and have their properties panel maximized. Can be disabled in Preferences/Viewer. #744