[Bf-blender-cvs] [1939ab19981] soc-2021-knife-tools: Cleanup: Moved Knife axis colors into KnifeColors struct

[Cian Jinks]

Commit: 1939ab199816860eb2c4f69ce2c871031c9146c5
Author: Cian Jinks
Date:   Thu Aug 12 14:18:10 2021 +0100
Branches: soc-2021-knife-tools
https://developer.blender.org/rB1939ab199816860eb2c4f69ce2c871031c9146c5

Cleanup: Moved Knife axis colors into KnifeColors struct

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

M	source/blender/editors/mesh/editmesh_knife.c

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

diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 73880caa92f..08aad41c5fe 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -107,6 +107,10 @@ typedef struct KnifeColors {
   uchar curpoint_a[4];
   uchar point[3];
   uchar point_a[4];
+  uchar xaxis[3];
+  uchar yaxis[3];
+  uchar zaxis[3];
+  uchar axis_extra[3];
 } KnifeColors;
 
 /* Knifetool Operator. */
@@ -464,19 +468,19 @@ static void knifetool_draw_orientation_locking(const KnifeTool_OpData *kcd)
 
     switch (kcd->constrain_axis) {
       case KNF_CONSTRAIN_AXIS_X: {
-        immUniformThemeColor3(TH_AXIS_X);
+        immUniformColor3ubv(kcd->colors.xaxis);
         break;
       }
       case KNF_CONSTRAIN_AXIS_Y: {
-        immUniformThemeColor3(TH_AXIS_Y);
+        immUniformColor3ubv(kcd->colors.yaxis);
         break;
       }
       case KNF_CONSTRAIN_AXIS_Z: {
-        immUniformThemeColor3(TH_AXIS_Z);
+        immUniformColor3ubv(kcd->colors.zaxis);
         break;
       }
       default: {
-        immUniformThemeColor3(TH_TRANSFORM);
+        immUniformColor3ubv(kcd->colors.axis_extra);
         break;
       }
     }
@@ -4058,6 +4062,11 @@ static void knife_init_colors(KnifeColors *colors)
   UI_GetThemeColorType3ubv(TH_ACTIVE_SPLINE, SPACE_VIEW3D, colors->point);
   UI_GetThemeColorType3ubv(TH_ACTIVE_SPLINE, SPACE_VIEW3D, colors->point_a);
   colors->point_a[3] = 102;
+
+  UI_GetThemeColorType3ubv(TH_AXIS_X, SPACE_VIEW3D, colors->xaxis);
+  UI_GetThemeColorType3ubv(TH_AXIS_Y, SPACE_VIEW3D, colors->yaxis);
+  UI_GetThemeColorType3ubv(TH_AXIS_Z, SPACE_VIEW3D, colors->zaxis);
+  UI_GetThemeColorType3ubv(TH_TRANSFORM, SPACE_VIEW3D, colors->axis_extra);
 }
 
 static void knife_switch_object(KnifeTool_OpData *kcd, Object *ob, int base_index)