Merge branch 'master' into issues_Q

Author: dcwhite

src/Core/Datatypes/ColorMap.cc

@@ -47,8 +47,11 @@ ColorMapHandle StandardColorMapFactory::create(const std::string& name)
     return ColorMapHandle(rainbow_.clone());
   if (name == "Gray")
     return ColorMapHandle(grayscale_.clone());
+  if (name == "Blackbody")
+    return ColorMapHandle(blackbody_.clone());
   THROW_INVALID_ARGUMENT("Unknown standard colormap name: " + name);
 }
 
 ColorMap StandardColorMapFactory::rainbow_("Rainbow");
 ColorMap StandardColorMapFactory::grayscale_("Grayscale");
+ColorMap StandardColorMapFactory::blackbody_("Blackbody");

src/Core/Datatypes/ColorMap.h

@@ -58,6 +58,7 @@ namespace Datatypes {
     StandardColorMapFactory();
     static ColorMap rainbow_;
     static ColorMap grayscale_;
+    static ColorMap blackbody_;
   };
 
 }}}