scripts/startup/bl_ui/space_image.py

@@ -1427,8 +1427,11 @@ class IMAGE_PT_view_vectorscope(ImageScopesPanel, Panel):
         layout = self.layout
 
         sima = context.space_data
+
         layout.template_vectorscope(sima, "scopes")
-        layout.prop(sima.scopes, "vectorscope_alpha")
+        row = layout.split(factor=0.75)
+        row.prop(sima.scopes, "vectorscope_alpha")
+        row.prop(sima.scopes, "vectorscope_mode", text="")
 
 
 class IMAGE_PT_sample_line(ImageScopesPanel, Panel):

source/blender/editors/interface/interface_draw.cc

@@ -991,8 +991,7 @@ void ui_draw_but_VECTORSCOPE(ARegion * /*region*/,
   const float centery = rect.ymin + h * 0.5f;
   const float diam = (w < h) ? w : h;
 
-  const float alpha = scopes->vecscope_alpha * scopes->vecscope_alpha * scopes->vecscope_alpha;
-  const float vecsope_col[3] = {alpha, alpha, alpha};
+  const float alpha = scopes->vecscope_alpha;
 
   GPU_blend(GPU_BLEND_ALPHA);
 
@@ -1123,14 +1122,21 @@ void ui_draw_but_VECTORSCOPE(ARegion * /*region*/,
 
   if (scopes->ok && scopes->vecscope != nullptr) {
     /* pixel point cloud */
-    GPU_blend(GPU_BLEND_ALPHA);
     GPU_point_size(1.0);
 
     GPU_matrix_push();
     GPU_matrix_translate_2f(centerx, centery);
     GPU_matrix_scale_1f(diam);
 
-    waveform_draw_rgb(scopes->vecscope, scopes->waveform_tot, scopes->vecscope_rgb);
+    const float col[3] = {alpha, alpha, alpha};
+    if (scopes->vecscope_mode == SCOPES_VECSCOPE_RGB) {
+      GPU_blend(GPU_BLEND_ALPHA);
+      waveform_draw_rgb(scopes->vecscope, scopes->waveform_tot, scopes->vecscope_rgb);
+    }
+    else if (scopes->vecscope_mode == SCOPES_VECSCOPE_LUMA) {
+      GPU_blend(GPU_BLEND_ADDITIVE);
+      waveform_draw_one(scopes->vecscope, scopes->waveform_tot, col);
+    }
 
     GPU_matrix_pop();
   }

source/blender/makesdna/DNA_color_types.h

@@ -150,13 +150,15 @@ typedef struct Scopes {
   int ok;
   int sample_full;
   int sample_lines;
-  float accuracy;
   int wavefrm_mode;
+  int vecscope_mode;
+  int wavefrm_height;
+  int vecscope_height;
+  int waveform_tot;
+  float accuracy;
   float wavefrm_alpha;
   float wavefrm_yfac;
-  int wavefrm_height;
   float vecscope_alpha;
-  int vecscope_height;
   float minmax[3][2];
   struct Histogram hist;
   float *waveform_1;
@@ -164,8 +166,7 @@ typedef struct Scopes {
   float *waveform_3;
   float *vecscope;
   float *vecscope_rgb;
-  int waveform_tot;
-  char _pad[4];
+  char _pad[8];  // Adjusted for alignment
 } Scopes;
 
 /** #Scopes.wavefrm_mode */
@@ -178,6 +179,12 @@ enum {
   SCOPES_WAVEFRM_RGB = 5,
 };
 
+/** #Scopes.vecscope_mode */
+enum {
+ SCOPES_VECSCOPE_RGB = 0,
+ SCOPES_VECSCOPE_LUMA = 1,
+};
+
 typedef struct ColorManagedViewSettings {
   int flag;
   char _pad[4];

source/blender/makesrna/intern/rna_color.cc

@@ -1145,6 +1145,12 @@ static void rna_def_scopes(BlenderRNA *brna)
       {0, nullptr, 0, nullptr, nullptr},
   };
 
+  static const EnumPropertyItem prop_vecscope_mode_items[] = {
+     {SCOPES_VECSCOPE_LUMA, "LUMA", ICON_COLOR, "Luma", ""},
+     {SCOPES_VECSCOPE_RGB, "RGB", ICON_COLOR, "Red Green Blue", ""},
+     {0, nullptr, 0, nullptr, nullptr},
+  };
+  
   srna = RNA_def_struct(brna, "Scopes", nullptr);
   RNA_def_struct_ui_text(srna, "Scopes", "Scopes for statistical view of an image");
 
@@ -1177,10 +1183,17 @@ static void rna_def_scopes(BlenderRNA *brna)
   RNA_def_property_range(prop, 0, 1);
   RNA_def_property_ui_text(prop, "Waveform Opacity", "Opacity of the points");
 
+  prop = RNA_def_property(srna, "vectorscope_mode", PROP_ENUM, PROP_NONE);
+  RNA_def_property_enum_sdna(prop, "Scopes", "vecscope_mode");
+  RNA_def_property_enum_items(prop, prop_vecscope_mode_items);
+  RNA_def_property_ui_text(prop, "Vectorscope Mode", "");
+  RNA_def_property_update(prop, 0, "rna_Scopes_update");
+
   prop = RNA_def_property(srna, "vectorscope_alpha", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, "Scopes", "vecscope_alpha");
   RNA_def_property_range(prop, 0, 1);
   RNA_def_property_ui_text(prop, "Vectorscope Opacity", "Opacity of the points");
+  RNA_def_property_update(prop, 0, "rna_Scopes_update");
 }
 
 static void rna_def_colormanage(BlenderRNA *brna)