Merge branch 'RB-2.4' into RB-2.5

NatronGitHub · Jan 23, 2022 · 6956ce3 · 6956ce3
2 parents 7ba998a + 8be1624
commit 6956ce3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,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

diff --git 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