Merge remote-tracking branch 'origin/Beta_8.995' into Beta_8.995

2022-04-21 17:07:39 +03:00
parent b9be7f577b d7d53399a0
commit 7406c444ed
67 changed files with 2113 additions and 686 deletions
--- a/camlib.py
+++ b/camlib.py
@@ -7193,7 +7193,7 @@ class CNCjob(Geometry):
            return

        try:
-            if self.app.options['global_theme'] == 'white':
+            if self.app.options['global_theme'] == 'light':
                obj.annotation.set(text=text, pos=pos, visible=obj.obj_options['plot'],
                                   font_size=self.app.options["cncjob_annotation_fontsize"],
                                   color=self.app.options["cncjob_annotation_fontcolor"])