[Bf-extensions-cvs] [e0595889] master: Fix T63955: label text not used as a keyword arg
Campbell Barton
noreply at git.blender.org
Mon Apr 29 04:24:08 CEST 2019
Commit: e059588947d55de88c4472abd65b187da621cdfa
Author: Campbell Barton
Date: Mon Apr 29 12:22:49 2019 +1000
Branches: master
https://developer.blender.org/rBAe059588947d55de88c4472abd65b187da621cdfa
Fix T63955: label text not used as a keyword arg
===================================================================
M add_curve_sapling/__init__.py
M blenderkit/__init__.py
M blenderkit/ui_panels.py
M io_coat3D/__init__.py
M io_convert_image_to_mesh_img/ui/terrainpanel.py
M io_export_after_effects.py
M io_sequencer_edl/__init__.py
M materials_library_vx/__init__.py
M mesh_extra_tools/__init__.py
M mocap/__init__.py
M node_wrangler.py
M oscurart_tools/object/selection.py
M render_auto_tile_size.py
M render_povray/nodes.py
M render_povray/ui.py
===================================================================
diff --git a/add_curve_sapling/__init__.py b/add_curve_sapling/__init__.py
index a657264a..3b9bdd09 100644
--- a/add_curve_sapling/__init__.py
+++ b/add_curve_sapling/__init__.py
@@ -868,7 +868,7 @@ class AddTree(Operator):
layout = self.layout
# Branch specs
- # layout.label('Tree Definition')
+ # layout.label(text='Tree Definition')
layout.prop(self, 'chooseSet')
diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 9850d5d8..0bafa699 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -1303,7 +1303,7 @@ class BlenderKitAddonPreferences(AddonPreferences):
icon='QUESTION')
op.url = paths.BLENDERKIT_SIGNUP_URL
layout.prop(self, "api_key", text='Your API Key')
- # layout.label('After you paste API Key, categories are downloaded, so blender will freeze for a few seconds.')
+ # layout.label(text='After you paste API Key, categories are downloaded, so blender will freeze for a few seconds.')
layout.prop(self, "global_dir")
layout.prop(self, "project_subdir")
# layout.prop(self, "temp_dir")
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index 98281747..2f94ba13 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -518,7 +518,7 @@ class VIEW3D_PT_blenderkit_unified(Panel):
#
row.prop(ui_props, 'down_up', expand=True, icon_only=True)
- # row.label('')
+ # row.label(text='')
row = row.split().row()
row.prop(ui_props, 'asset_type', expand=True, icon_only=True)
diff --git a/io_coat3D/__init__.py b/io_coat3D/__init__.py
index 02481f83..ef2da4e0 100644
--- a/io_coat3D/__init__.py
+++ b/io_coat3D/__init__.py
@@ -1194,7 +1194,7 @@ class SCENE_PT_Main(bpy.types.Panel):
row = layout.row()
row.label(text="Applink didn't find your 3d-Coat/Exchange folder.")
row = layout.row()
- row.label("Please select it before using Applink.")
+ row.label(text="Please select it before using Applink.")
row = layout.row()
row.prop(coat3D,"exchangedir",text="")
row = layout.row()
diff --git a/io_convert_image_to_mesh_img/ui/terrainpanel.py b/io_convert_image_to_mesh_img/ui/terrainpanel.py
index 8a2bece3..284b8600 100644
--- a/io_convert_image_to_mesh_img/ui/terrainpanel.py
+++ b/io_convert_image_to_mesh_img/ui/terrainpanel.py
@@ -101,19 +101,19 @@ class TerrainPanel(Panel):
dtm_resolution = metadata_panel.row()
dtm_resolution.label(text='Current Resolution: ')
- dtm_resolution.label('{:9,.2%}'.format(
+ dtm_resolution.label(text='{:9,.2%}'.format(
obj['DTM_RESOLUTION']
))
mesh_scale = metadata_panel.row()
mesh_scale.label(text='Current Scale: ')
- mesh_scale.label('{:9,.2f} m/post'.format(
+ mesh_scale.label(text='{:9,.2f} m/post'.format(
obj['MESH_SCALE']
))
dtm_scale = metadata_panel.row()
dtm_scale.label(text='Original Scale: ')
- dtm_scale.label('{:9,.2f} m/post'.format(
+ dtm_scale.label(text='{:9,.2f} m/post'.format(
obj['MAP_SCALE']
))
diff --git a/io_export_after_effects.py b/io_export_after_effects.py
index 65c60f5c..c0afe51f 100644
--- a/io_export_after_effects.py
+++ b/io_export_after_effects.py
@@ -738,7 +738,7 @@ class ExportJsx(bpy.types.Operator, ExportHelper):
layout = self.layout
box = layout.box()
- box.label('Size fo AE Comp (pixels per 1 BU)')
+ box.label(text='Size fo AE Comp (pixels per 1 BU)')
box.prop(self, 'ae_size')
box.label(text='Animation:')
box.prop(self, 'include_animation')
diff --git a/io_sequencer_edl/__init__.py b/io_sequencer_edl/__init__.py
index 5afc1a8d..8d1d871c 100644
--- a/io_sequencer_edl/__init__.py
+++ b/io_sequencer_edl/__init__.py
@@ -300,7 +300,7 @@ class SEQUENCER_PT_import_edl(bpy.types.Panel):
col.prop(reel, "frame_offset")
if reel is None:
- box.label("Empty (No EDL Data)")
+ box.label(text="Empty (No EDL Data)")
box.operator(FindReelsEDL.bl_idname, icon='EXTERNAL_DATA')
diff --git a/materials_library_vx/__init__.py b/materials_library_vx/__init__.py
index 17e3934e..0e9cf5e7 100644
--- a/materials_library_vx/__init__.py
+++ b/materials_library_vx/__init__.py
@@ -930,8 +930,8 @@ class MATLIB_OT_operator(Operator):
layout = self.layout
#cmd = LIBRARY_ADD
if self.cmd == "LIBRARY_ADD":
- #layout.label("Select a blend file as library or")
- #layout.label("Type a name to create a new library.")
+ #layout.label(text="Select a blend file as library or")
+ #layout.label(text="Type a name to create a new library.")
layout.prop(self, "category", text="Library")
elif self.cmd == "FILTER_ADD":
layout.prop(self, "category")
@@ -1191,15 +1191,15 @@ class MATLIB_PT_vxPanel(Panel):
# if (matlib.current_library):
# row.label(matlib.current_library.name)
# else:
-# row.label("Library not found!.")
+# row.label(text="Library not found!.")
"""
classes = [
matlibMaterials,
matlibProperties,
EmptyGroup,
-MATLIB_PT_vxPanel,
-MATLIB_OT_operator,
-MATLIB_MT_LibsMenu,
+MATLIB_PT_vxPanel,
+MATLIB_OT_operator,
+MATLIB_MT_LibsMenu,
MATLIB_MT_CatsMenu
]
#print(bpy.context.scene)
diff --git a/mesh_extra_tools/__init__.py b/mesh_extra_tools/__init__.py
index c1b9d388..307db313 100644
--- a/mesh_extra_tools/__init__.py
+++ b/mesh_extra_tools/__init__.py
@@ -818,15 +818,15 @@ class mesh_extra_tools_pref(AddonPreferences):
if self.show_info:
box.label(text="Collection of various extra Mesh Edit Functions",
icon="LAYER_ACTIVE")
- box.label("The majority of the tools can be found in"
+ box.label(text="The majority of the tools can be found in"
"Mesh Edit Mode Toolshelf or W key Specials Menu",
icon="LAYER_USED")
- box.label("The Pen tool is a separate Panel in the Toolshelf",
+ box.label(text="The Pen tool is a separate Panel in the Toolshelf",
icon="LAYER_USED")
- box.label("The Face Extrude tool is only available in Object Mode "
+ box.label(text="The Face Extrude tool is only available in Object Mode "
"as a separate panel in the Toolshelf",
icon="LAYER_USED")
- box.label("Face Info / Select is a separate Panel located in Properties > Data Editor",
+ box.label(text="Face Info / Select is a separate Panel located in Properties > Data Editor",
icon="LAYER_USED")
box.prop(self, "show_shortcuts", icon="KEYINGSET")
@@ -834,21 +834,21 @@ class mesh_extra_tools_pref(AddonPreferences):
col = box.column()
col.label(text="Double Right Click in Edit mode in the 3D Viewport",
icon="LAYER_ACTIVE")
- col.label("Used for quick access to the Vertex, Edge and Face context menus",
+ col.label(text="Used for quick access to the Vertex, Edge and Face context menus",
icon="LAYER_USED")
col.separator()
col.label(text="W-key in Edit Mode in the 3D Viewport",
icon="LAYER_ACTIVE")
- col.label("Tools are grouped into menus prepended to the Specials Menu",
+ col.label(text="Tools are grouped into menus prepended to the Specials Menu",
icon="LAYER_USED")
col.separator()
col.label(text="Ctrl+D in Edit Mode in the 3D Viewport",
icon="LAYER_ACTIVE")
- col.label("Used by the Pen Tool to start drawing. When activated:",
+ col.label(text="Used by the Pen Tool to start drawing. When activated:",
icon="LAYER_USED")
- col.label("Shift + Mouse Move is used to draw along the X axis",
+ col.label(text="Shift + Mouse Move is used to draw along the X axis",
icon="LAYER_USED")
- col.label("Alt + Mouse Move is used to draw along the Y axis",
+ col.label(text="Alt + Mouse Move is used to draw along the Y axis",
icon="LAYER_USED")
col.separator()
col.label(text="Note: when using Fast Loop operator, press Esc twice to finish",
diff --git a/mocap/__init__.py b/mocap/__init__.py
index cc2a9a2c..f040e0b1 100644
--- a/mocap/__init__.py
+++ b/mocap/__init__.py
@@ -295,7 +295,7 @@ class MocapPanel(bpy.types.Panel):
enduser_obj = bpy.context.active_object
performer_obj = [obj for obj in bpy.context.selected_objects if obj != enduser_obj]
if enduser_obj is None or len(performer_obj) != 1:
- layout.label("Select performer rig and target rig (as active)")
+ layout.label(text="Select performer rig and target rig (as active)")
else:
layout.operator("mocap.guessmapping", text="Guess Hierarchy Mapping")
labelRow = layout.row(align=True)
diff --git a/node_wrangler.py b/node_wrangler.py
index 8c3f71f2..7cb71f38 100644
--- a/node_wrangler.py
+++ b/node_wrangler.py
@@ -4035,7 +4035,7 @@ class NWVertColMenu(bpy.types.Menu):
for vcol in vcols:
l.operator(NWAddAttrNode.bl_idname, text=vcol).attr_name = vcol
else:
- l.label("No Vertex Color layers on objects with this material")
+ l.label(text="No Vertex Color layers on objects with this material")
class NWSwitchNodeTypeMenu(Menu, NWBase):
diff --git a/oscurart_tools/object/selection.py b/oscurart_tools/object/selection.py
index 39f6b603..44eb2a03 100644
--- a/oscurart_tools/object/selection.py
+++ b/oscurart_tools/object/selection.py
@@ -59,7 +59,5 @@ class OSSELECTION_HT_OscSelection(bpy.types.Header):
"""
layout = self.layout
row = layout.row()
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list