Merge branch 'master' into blender2.8

raulesgalindo · Sep 7, 2018 · 772b5e1 · 772b5e1
2 parents 410ea07 + 1a93529
commit 772b5e1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
@@ -295,7 +295,7 @@ def draw(self, context):
         col.prop(self, "spire_resolution")
         row = col.row(align=True).split(0.9, align=True)
         row.prop(self, "spires")
-        row.prop(self, "direction", toggle=True, text="", icon="ARROW_LEFTRIGHT")
+        row.prop(self, "direction", toggle=True, text="", icon='ARROW_LEFTRIGHT')
         col.prop(self, "offset")
         col.prop(self, "waves")
         col.prop(self, "wave_iscale")

diff --git a/add_curve_extra_objects/add_curve_torus_knots.py b/add_curve_extra_objects/add_curve_torus_knots.py
@@ -576,12 +576,12 @@ def draw(self, context):
         split = box.split(percentage=0.85, align=True)
         split.prop(self, "torus_p", text="Revolutions")
         split.prop(self, "flip_p", toggle=True, text="",
-                   icon="ARROW_LEFTRIGHT")
+                   icon='ARROW_LEFTRIGHT')
 
         split = box.split(percentage=0.85, align=True)
         split.prop(self, "torus_q", text="Spins")
         split.prop(self, "flip_q", toggle=True, text="",
-                   icon="ARROW_LEFTRIGHT")
+                   icon='ARROW_LEFTRIGHT')
 
         links = gcd(self.torus_p, self.torus_q)
         info = "Multiple Links"

diff --git a/measureit/__init__.py b/measureit/__init__.py
@@ -30,7 +30,7 @@
     "author": "Antonio Vazquez (antonioya)",
     "location": "View3D > Tools Panel /Properties panel",
     "version": (1, 7, 1),
-    "blender": (2, 7, 4),
+    "blender": (2, 79, 0),
     "description": "Tools for measuring objects.",
     "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
                 "Py/Scripts/3D_interaction/Measureit",

diff --git a/sequencer_kinoraw_tools/ui.py b/sequencer_kinoraw_tools/ui.py
@@ -354,7 +354,7 @@ def draw(self, context):
                         row.operator("sequencerextra.sourceout", icon='MARKER_HLT', text="OUT")
 
                     row.separator()
-                    row.operator("sequencerextra.setinout", icon="ARROW_LEFTRIGHT", text="")
+                    row.operator("sequencerextra.setinout", icon='ARROW_LEFTRIGHT', text="")
                     row.operator("sequencerextra.triminout", icon="FULLSCREEN_EXIT", text="")
 
                 # miniUI extra actions
@@ -411,7 +411,7 @@ def draw(self, context):
                 row2 = col.row(align=True)
                 row2.operator("sequencerextra.sourceout", icon='MARKER_HLT', text="Set OUT")
                 row3 = col.row()
-                row3.operator("sequencerextra.setinout", icon="ARROW_LEFTRIGHT", text="Selected")
+                row3.operator("sequencerextra.setinout", icon='ARROW_LEFTRIGHT', text="Selected")
 
                 sub_col = box.split(percentage=0.67, align=True)
                 row4 = sub_col.row(align=True)