[Bf-blender-cvs] [5d3c815c2fe] blender2.8: Revert "Compositor: Added Weighted Standard Curve evaluation"

[Brecht Van Lommel]

Commit: 5d3c815c2fe289224a44d8bb8de60b319e616d2c
Author: Brecht Van Lommel
Date:   Tue Sep 25 18:22:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5d3c815c2fe289224a44d8bb8de60b319e616d2c

Revert "Compositor: Added Weighted Standard Curve evaluation"

This reverts commit b8c9df6f21587014cb6f11aa5bed6f9c1044e6ee. The code is not
correct with regards to color management, and its purpose was not documented.

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

M	source/blender/blenkernel/intern/colortools.c
M	source/blender/editors/interface/interface_templates.c
M	source/blender/makesdna/DNA_color_types.h
M	source/blender/makesrna/intern/rna_color.c

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

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index c090569421d..1bdca5500f3 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -954,25 +954,6 @@ static void curvemapping_evaluateRGBF_filmlike(const CurveMapping *cumap, float
 	vecout[channel_offset[2]] = v2;
 }
 
-static float curvemapping_weighted_standard_triangle(float a, float b, float a1)
-{
-	if (a != b) {
-		float b1;
-		float a2 = a1 - a;
-
-		if (b < a) {
-			b1 = b + a2 * b / a ;
-		}
-		else {
-			b1 = b + a2 * (65535.0f - b) / (65535.0f - a);
-		}
-
-		return b1;
-	}
-
-	return a1;
-}
-
 /** same as #curvemapping_evaluate_premulRGBF
  * but black/bwmul are passed as args for the compositor
  * where they can change per pixel.
@@ -999,25 +980,6 @@ void curvemapping_evaluate_premulRGBF_ex(
 			vecout[2] = curvemap_evaluateF(&cumap->cm[2], b);
 			break;
 		}
-		case CURVE_TONE_WEIGHTED_STANDARD:
-		{
-			float r1 = curvemap_evaluateF(&cumap->cm[0], r);
-			float g1 = curvemapping_weighted_standard_triangle(r, r1, g);
-			float b1 = curvemapping_weighted_standard_triangle(r, r1, b);
-
-			float g2 = curvemap_evaluateF(&cumap->cm[1], g);
-			float r2 = curvemapping_weighted_standard_triangle(g, g2, r);
-			float b2 = curvemapping_weighted_standard_triangle(g, g2, b);
-
-			float b3 = curvemap_evaluateF(&cumap->cm[2], b);
-			float r3 = curvemapping_weighted_standard_triangle(b, b3, r);
-			float g3 = curvemapping_weighted_standard_triangle(b, b3, g);
-
-			vecout[0] = r1 * 0.50f + r2 * 0.25f + r3 * 0.25f;
-			vecout[1] = g1 * 0.25f + g2 * 0.50f + g3 * 0.25f;
-			vecout[2] = b1 * 0.25f + b2 * 0.25f + b3 * 0.50f;
-			break;
-		}
 		case CURVE_TONE_FILMLIKE:
 		{
 			if (r >= g) {
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 59b5db61b53..90b230ab2b0 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2977,7 +2977,7 @@ static void curvemap_buttons_layout(
 
 	if (tone) {
 		split = uiLayoutSplit(layout, 0.0f, false);
-		uiItemR(uiLayoutRow(split, false), ptr, "tone", 0, NULL, ICON_NONE);
+		uiItemR(uiLayoutRow(split, false), ptr, "tone", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 	}
 
 	/* curve chooser */
diff --git a/source/blender/makesdna/DNA_color_types.h b/source/blender/makesdna/DNA_color_types.h
index def1a2bad91..01f0b06c178 100644
--- a/source/blender/makesdna/DNA_color_types.h
+++ b/source/blender/makesdna/DNA_color_types.h
@@ -107,9 +107,8 @@ typedef enum eCurveMappingPreset {
 
 /* CurveMapping->tone */
 typedef enum eCurveMappingTone {
-	CURVE_TONE_STANDARD =          0,
-	CURVE_TONE_WEIGHTED_STANDARD = 1,
-	CURVE_TONE_FILMLIKE =          2,
+	CURVE_TONE_STANDARD = 0,
+	CURVE_TONE_FILMLIKE = 2,
 } eCurveMappingTone;
 
 /* histogram->mode */
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index f91be9ae1e9..4cbe365167c 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -764,9 +764,8 @@ static void rna_def_curvemapping(BlenderRNA *brna)
 	FunctionRNA *func;
 
 	static const EnumPropertyItem tone_items[] = {
-		{CURVE_TONE_STANDARD,          "STANDARD", 0, "Standard",          ""},
-		{CURVE_TONE_WEIGHTED_STANDARD, "WEIGHTED", 0, "Weighted Standard", ""},
-		{CURVE_TONE_FILMLIKE,          "FILMLIKE", 0, "Film like",         ""},
+		{CURVE_TONE_STANDARD, "STANDARD", 0, "Standard",  ""},
+		{CURVE_TONE_FILMLIKE, "FILMLIKE", 0, "Film like", ""},
 		{0, NULL, 0, NULL, NULL}
 	};