Merge branch 'blender-v2.82-release'

2 files changed, 16 insertions, 7 deletions

diff --git a/source/blender/editors/io/io_usd.c b/source/blender/editors/io/io_usd.c
index 67e2091e128..bb527ee6a3f 100644
--- a/source/blender/editors/io/io_usd.c
+++ b/source/blender/editors/io/io_usd.c
@@ -32,6 +32,8 @@
 #  include "BLI_string.h"
 #  include "BLI_utildefines.h"
 
+#  include "BLT_translation.h"
+
 #  include "MEM_guardedalloc.h"
 
 #  include "RNA_access.h"
@@ -152,10 +154,13 @@ static void wm_usd_export_draw(bContext *UNUSED(C), wmOperator *op)
   uiItemR(col, ptr, "export_uvmaps", 0, NULL, ICON_NONE);
   uiItemR(col, ptr, "export_normals", 0, NULL, ICON_NONE);
   uiItemR(col, ptr, "export_materials", 0, NULL, ICON_NONE);
-  uiItemR(col, ptr, "use_instancing", 0, NULL, ICON_NONE);
 
   col = uiLayoutColumn(layout, true);
   uiItemR(col, ptr, "evaluation_mode", 0, NULL, ICON_NONE);
+
+  uiLayout *box = uiLayoutBox(layout);
+  uiItemL(box, IFACE_("Experimental:"), ICON_NONE);
+  uiItemR(box, ptr, "use_instancing", 0, NULL, ICON_NONE);
 }
 
 void WM_OT_usd_export(struct wmOperatorType *ot)
@@ -180,7 +185,7 @@ void WM_OT_usd_export(struct wmOperatorType *ot)
   RNA_def_boolean(ot->srna,
                   "selected_objects_only",
                   false,
-                  "Only Export Selected Objects",
+                  "Selection Only",
                   "Only selected objects are exported. Unselected parents of selected objects are "
                   "exported as empty transform");
 
@@ -212,16 +217,17 @@ void WM_OT_usd_export(struct wmOperatorType *ot)
   RNA_def_boolean(ot->srna,
                   "use_instancing",
                   false,
-                  "Use Instancing (EXPERIMENTAL)",
-                  "When true, dupli-objects are written as instances of the original in USD. "
-                  "Experimental feature, not working perfectly");
+                  "Instancing",
+                  "When checked, instanced objects are exported as references in USD. "
+                  "When unchecked, instanced objects are exported as real objects");
 
   RNA_def_enum(ot->srna,
                "evaluation_mode",
                rna_enum_usd_export_evaluation_mode_items,
                DAG_EVAL_RENDER,
-               "Evaluation Mode",
-               "Determines visibility of objects and modifier settings");
+               "Use Settings for",
+               "Determines visibility of objects, modifier settings, and other areas where there "
+               "are different settings for viewport and rendering");
 }
 
 #endif /* WITH_USD */
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 758bea2da60..a118347ad9c 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2315,6 +2315,7 @@ static void radial_control_paint_cursor(bContext *UNUSED(C), int x, int y, void
   float strwidth, strheight;
   float r1 = 0.0f, r2 = 0.0f, rmin = 0.0, tex_radius, alpha;
   float zoom[2], col[4] = {1.0f, 1.0f, 1.0f, 1.0f};
+  float text_color[4];
 
   switch (rc->subtype) {
     case PROP_NONE:
@@ -2441,6 +2442,8 @@ static void radial_control_paint_cursor(bContext *UNUSED(C), int x, int y, void
   immUnbindProgram();
 
   BLF_size(fontid, 1.75f * fstyle_points * U.pixelsize, U.dpi);
+  UI_GetThemeColor4fv(TH_TEXT_HI, text_color);
+  BLF_color4fv(fontid, text_color);
 
   /* draw value */
   BLF_width_and_height(fontid, str, strdrawlen, &strwidth, &strheight);