[Bf-blender-cvs] [c469934ba99] temp-viewport-compositor-merge: Merge branch 'master' into temp-viewport-compositor-merge

[Omar Emara]

Commit: c469934ba9968dad2747ff816e356e176f84ca3c
Author: Omar Emara
Date:   Mon May 30 15:08:23 2022 +0200
Branches: temp-viewport-compositor-merge
https://developer.blender.org/rBc469934ba9968dad2747ff816e356e176f84ca3c

Merge branch 'master' into temp-viewport-compositor-merge

===================================================================



===================================================================

diff --cc source/blender/imbuf/IMB_colormanagement.h
index e32853609e5,512dc674fc7..c3f8f032478
--- a/source/blender/imbuf/IMB_colormanagement.h
+++ b/source/blender/imbuf/IMB_colormanagement.h
@@@ -54,7 -54,8 +54,10 @@@ bool IMB_colormanagement_space_is_scene
  bool IMB_colormanagement_space_is_srgb(struct ColorSpace *colorspace);
  bool IMB_colormanagement_space_name_is_data(const char *name);
  bool IMB_colormanagement_space_name_is_scene_linear(const char *name);
+ bool IMB_colormanagement_space_name_is_srgb(const char *name);
+ 
++BLI_INLINE void IMB_colormanagement_get_luminance_coefficients(float rgb[3]);
 +
  /**
   * Convert a float RGB triplet to the correct luminance weighted average.
   *
diff --cc source/blender/imbuf/intern/colormanagement_inline.c
index e6d1b7da81f,668307ec802..ff8ea8f684e
--- a/source/blender/imbuf/intern/colormanagement_inline.c
+++ b/source/blender/imbuf/intern/colormanagement_inline.c
@@@ -11,6 -11,6 +11,11 @@@
  #include "BLI_math_vector.h"
  #include "IMB_colormanagement_intern.h"
  
++void IMB_colormanagement_get_luminance_coefficients(float rgb[3])
++{
++  copy_v3_v3(rgb, imbuf_luma_coefficients);
++}
++
  float IMB_colormanagement_get_luminance(const float rgb[3])
  {
    return dot_v3v3(imbuf_luma_coefficients, rgb);
diff --cc source/blender/nodes/composite/nodes/node_composite_map_range.cc
index 5c91d277707,e52c6d096b9..e9e81210f89
--- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc
@@@ -20,31 -16,11 +20,31 @@@ namespace blender::nodes::node_composit
  
  static void cmp_node_map_range_declare(NodeDeclarationBuilder &b)
  {
 -  b.add_input<decl::Float>(N_("Value")).default_value(1.0f).min(0.0f).max(1.0f);
 -  b.add_input<decl::Float>(N_("From Min")).default_value(0.0f).min(-10000.0f).max(10000.0f);
 -  b.add_input<decl::Float>(N_("From Max")).default_value(1.0f).min(-10000.0f).max(10000.0f);
 -  b.add_input<decl::Float>(N_("To Min")).default_value(0.0f).min(-10000.0f).max(10000.0f);
 -  b.add_input<decl::Float>(N_("To Max")).default_value(1.0f).min(-10000.0f).max(10000.0f);
 +  b.add_input<decl::Float>(N_("Value"))
 +      .default_value(1.0f)
 +      .min(0.0f)
 +      .max(1.0f)
 +      .compositor_domain_priority(0);
 +  b.add_input<decl::Float>(N_("From Min"))
 +      .default_value(0.0f)
 +      .min(-10000.0f)
 +      .max(10000.0f)
 +      .compositor_domain_priority(1);
 +  b.add_input<decl::Float>(N_("From Max"))
-       .default_value(0.0f)
++      .default_value(1.0f)
 +      .min(-10000.0f)
 +      .max(10000.0f)
 +      .compositor_domain_priority(2);
 +  b.add_input<decl::Float>(N_("To Min"))
 +      .default_value(0.0f)
 +      .min(-10000.0f)
 +      .max(10000.0f)
 +      .compositor_domain_priority(3);
 +  b.add_input<decl::Float>(N_("To Max"))
-       .default_value(0.0f)
++      .default_value(1.0f)
 +      .min(-10000.0f)
 +      .max(10000.0f)
 +      .compositor_domain_priority(4);
    b.add_output<decl::Float>(N_("Value"));
  }