Merge branch 'RB-2.4' into RB-2.5

devernay · devernay · commit 6956ce3e6284 · 2022-01-23T09:42:27.000-08:00
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

Original file line number	Diff line number	Diff line change
`@@ -3164,7 +3164,7 @@ renderPreview(const Image & srcImg,`
`3164`	`3164`	`bool convertToSrgb,`
`3165`	`3165`	`unsigned int* dstPixels)`
`3166`	`3166`	`{`
`3167`		`-#ifndef DEBUG_NAN`
	`3167`	`+#if defined(DEBUG) && !defined(DEBUG_NAN)`
`3168`	`3168`	`// Some plugins generate FP exceptions`
`3169`	`3169`	`boost_adaptbx::floating_point::exception_trapping trap(0);`
`3170`	`3170`	`#endif`