diff options
Diffstat (limited to 'release')
17 files changed, 39 insertions, 40 deletions
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index a6304378cc4..fdd22f403a4 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -63,7 +63,7 @@ def _test_import(module_name, loaded_modules): return None if "." in module_name: print("Ignoring '%s', can't import files containing " - "multiple periods." % module_name) + "multiple periods" % module_name) return None if use_time: @@ -159,7 +159,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): traceback.print_exc() else: print("\nWarning! '%s' has no register function, " - "this is now a requirement for registerable scripts." % + "this is now a requirement for registerable scripts" % mod.__file__) def unregister_module_call(mod): diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py index 3f6a3682e7c..91546e02829 100644 --- a/release/scripts/modules/bpy_extras/io_utils.py +++ b/release/scripts/modules/bpy_extras/io_utils.py @@ -233,8 +233,8 @@ def axis_conversion(from_forward='Y', from_up='Z', to_forward='Y', to_up='Z'): return Matrix().to_3x3() if from_forward[-1] == from_up[-1] or to_forward[-1] == to_up[-1]: - raise Exception("invalid axis arguments passed, " - "can't use up/forward on the same axis.") + raise Exception("Invalid axis arguments passed, " + "can't use up/forward on the same axis") value = reduce(int.__or__, (_axis_convert_num[a] << (i * 3) for i, a in enumerate((from_forward, diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index b3127733c1e..6b65f720a5c 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -206,7 +206,7 @@ class _GenericBone: @property def children_recursive(self): - """a list of all children from this bone.""" + """A list of all children from this bone.""" bones_children = [] for bone in self._other_bones: index = bone.parent_index(self) diff --git a/release/scripts/modules/console_python.py b/release/scripts/modules/console_python.py index 425ea210104..94d0c8c8614 100644 --- a/release/scripts/modules/console_python.py +++ b/release/scripts/modules/console_python.py @@ -299,7 +299,7 @@ def banner(context): add_scrollback("Builtin Modules: bpy, bpy.data, bpy.ops, bpy.props, bpy.types, bpy.context, bpy.utils, bgl, blf, mathutils", 'OUTPUT') add_scrollback("Convenience Imports: from mathutils import *; from math import *", 'OUTPUT') add_scrollback("", 'OUTPUT') - # add_scrollback(" WARNING!!! Blender 2.5 API is subject to change, see API reference for more info.", 'ERROR') + # add_scrollback(" WARNING!!! Blender 2.5 API is subject to change, see API reference for more info", 'ERROR') # add_scrollback("", 'OUTPUT') sc.prompt = PROMPT diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py index 9226cbed51b..2b190e1aee1 100644 --- a/release/scripts/startup/bl_operators/image.py +++ b/release/scripts/startup/bl_operators/image.py @@ -74,7 +74,7 @@ class EditExternally(Operator): if not os.path.exists(filepath): self.report({'ERROR'}, "Image path %r not found, image may be packed or " - "unsaved." % filepath) + "unsaved" % filepath) return {'CANCELLED'} cmd = self._editor_guess(context) + [filepath] diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 6c9f27afaa5..d7c6cfc0565 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -283,11 +283,11 @@ class ShapeTransfer(Operator): ), ('RELATIVE_FACE', "Relative Face", - "Calculate relative position (using faces).", + "Calculate relative position (using faces)", ), ('RELATIVE_EDGE', "Relative Edge", - "Calculate relative position (using edges).", + "Calculate relative position (using edges)", ), ), name="Transformation Mode", @@ -297,7 +297,7 @@ class ShapeTransfer(Operator): use_clamp = BoolProperty( name="Clamp Offset", description=("Clamp the transformation to the distance each " - "vertex moves in the original shape."), + "vertex moves in the original shape"), default=False, ) @@ -503,7 +503,7 @@ class ShapeTransfer(Operator): ob_act, objects = objects[0], [ob_act] if ob_act.type != 'MESH': - self.report({'ERROR'}, "Other object is not a mesh.") + self.report({'ERROR'}, "Other object is not a mesh") return {'CANCELLED'} if ob_act.active_shape_key is None: diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index 48b547980d4..c13a04eb87a 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -77,7 +77,7 @@ class QuickFur(Operator): if obj.type == 'MESH'] if not mesh_objects: - self.report({'ERROR'}, "Select at least one mesh object.") + self.report({'ERROR'}, "Select at least one mesh object") return {'CANCELLED'} mat = bpy.data.materials.new("Fur Material") @@ -157,7 +157,7 @@ class QuickExplode(Operator): fade = BoolProperty( name="Fade", - description="Fade the pieces over time.", + description="Fade the pieces over time", default=True, ) @@ -307,7 +307,7 @@ class QuickSmoke(Operator): show_flows = BoolProperty( name="Render Smoke Objects", - description="Keep the smoke objects visible during rendering.", + description="Keep the smoke objects visible during rendering", default=False, ) @@ -319,7 +319,7 @@ class QuickSmoke(Operator): max_co = -min_co if not mesh_objects: - self.report({'ERROR'}, "Select at least one mesh object.") + self.report({'ERROR'}, "Select at least one mesh object") return {'CANCELLED'} for obj in mesh_objects: @@ -428,7 +428,7 @@ class QuickFluid(Operator): ) show_flows = BoolProperty( name="Render Fluid Objects", - description="Keep the fluid objects visible during rendering.", + description="Keep the fluid objects visible during rendering", default=False, ) start_baking = BoolProperty( @@ -446,7 +446,7 @@ class QuickFluid(Operator): max_co = Vector((-100000, -100000, -100000)) if not mesh_objects: - self.report({'ERROR'}, "Select at least one mesh object.") + self.report({'ERROR'}, "Select at least one mesh object") return {'CANCELLED'} for obj in mesh_objects: diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index 856e182279a..53654ffbc6f 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -51,7 +51,7 @@ class SequencerCrossfadeSounds(Operator): seq2 = None break if seq2 is None: - self.report({'ERROR'}, "Select 2 sound strips.") + self.report({'ERROR'}, "Select 2 sound strips") return {'CANCELLED'} if seq1.frame_final_start > seq2.frame_final_start: s = seq1 @@ -71,7 +71,7 @@ class SequencerCrossfadeSounds(Operator): context.scene.frame_current = tempcfra return {'FINISHED'} else: - self.report({'ERROR'}, "The selected strips don't overlap.") + self.report({'ERROR'}, "The selected strips don't overlap") return {'CANCELLED'} diff --git a/release/scripts/startup/bl_operators/uvcalc_follow_active.py b/release/scripts/startup/bl_operators/uvcalc_follow_active.py index 6c258d094e8..05656f5397d 100644 --- a/release/scripts/startup/bl_operators/uvcalc_follow_active.py +++ b/release/scripts/startup/bl_operators/uvcalc_follow_active.py @@ -140,7 +140,7 @@ def extend(obj, operator, EXTEND_MODE): face_act = me.faces.active if face_act == -1: - operator.report({'ERROR'}, "No active face.") + operator.report({'ERROR'}, "No active face") return face_sel = [f for f in me.faces if len(f.vertices) == 4 and f.select] @@ -152,7 +152,7 @@ def extend(obj, operator, EXTEND_MODE): break if face_act_local_index == -1: - operator.report({'ERROR'}, "Active face not selected.") + operator.report({'ERROR'}, "Active face not selected") return # Modes diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index 060fe400045..d9cdb1794c2 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -531,7 +531,7 @@ def unwrap(operator, context, **kwargs): meshes = list({me for obj in context.selected_objects if obj.type == 'MESH' for me in (obj.data,) if me.faces and me.library is None}) if not meshes: - operator.report({'ERROR'}, "No mesh object.") + operator.report({'ERROR'}, "No mesh object") return {'CANCELLED'} lightmap_uvpack(meshes, **kwargs) diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 23838588f43..c4466e6453f 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -1070,11 +1070,11 @@ def main(context, # We want to pack all in 1 go, so pack now if USER_SHARE_SPACE: -#XXX Window.DrawProgressBar(0.9, "Box Packing for all objects...") +#XXX Window.DrawProgressBar(0.9, "Box Packing for all objects...") packIslands(collected_islandList) print("Smart Projection time: %.2f" % (time.time() - time1)) - # Window.DrawProgressBar(0.9, "Smart Projections done, time: %.2f sec." % (time.time() - time1)) + # Window.DrawProgressBar(0.9, "Smart Projections done, time: %.2f sec" % (time.time() - time1)) if is_editmode: bpy.ops.object.mode_set(mode='EDIT') diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index aa09a088c4f..861255f167f 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -218,7 +218,7 @@ class WM_OT_context_scale_int(Operator): ) always_step = BoolProperty( name="Always Step", - description="Always adjust the value by a minimum of 1 when 'value' is not 1.0.", + description="Always adjust the value by a minimum of 1 when 'value' is not 1.0", default=True, ) @@ -567,7 +567,7 @@ doc_new = StringProperty( ) data_path_iter = StringProperty( - description="The data path relative to the context, must point to an iterable.") + description="The data path relative to the context, must point to an iterable") data_path_item = StringProperty( description="The data path from each iterable to the value (int or float)") @@ -1175,7 +1175,7 @@ class WM_OT_copy_prev_settings(Operator): if bpy.data.is_saved is bpy.data.is_dirty is False: bpy.ops.wm.read_homefile() else: - self.report({'INFO'}, "Reload Start-Up file to restore settings.") + self.report({'INFO'}, "Reload Start-Up file to restore settings") return {'FINISHED'} return {'CANCELLED'} diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 6448b9a5229..2e0b36a7a75 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -110,8 +110,7 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel): col.label(text="Fill:") sub = col.column() sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D')) - sub.prop(curve, "use_fill_front") - sub.prop(curve, "use_fill_back") + sub.prop(curve, "fill_mode", text="") col.prop(curve, "use_fill_deform", text="Fill Deformed") diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 6f58f060504..d4378b0d094 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -108,7 +108,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): layout.template_ID(context.space_data, "pin_id") if part.is_fluid: - layout.label(text="Settings used for fluid.") + layout.label(text="Settings used for fluid") return layout.prop(part, "type", text="Type") @@ -145,7 +145,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): #row.label(text="Render") if part.is_fluid: - layout.label(text=str(part.count) + " fluid particles for this frame.") + layout.label(text=str(part.count) + " fluid particles for this frame") return row = col.row() @@ -721,7 +721,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): row.prop(rule, "use_predict") row.prop(rule, "fear_factor") elif rule.type == 'FOLLOW_PATH': - row.label(text="Not yet functional.") + row.label(text="Not yet functional") elif rule.type == 'AVOID_COLLISION': row.prop(rule, "use_avoid") row.prop(rule, "use_avoid_collision") @@ -1050,7 +1050,7 @@ class PARTICLE_PT_children(ParticleButtonsPanel, Panel): sub = col.column(align=True) sub.label(text="Parting not") sub.label(text="available with") - sub.label(text="virtual parents.") + sub.label(text="virtual parents") else: sub = col.column(align=True) sub.prop(part, "child_parting_factor", text="Parting", slider=True) diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 66f967bb6e1..5a25e608a39 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -228,22 +228,22 @@ class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): class ANIM_OT_keying_set_export(Operator): - "Export Keying Set to a python script." + "Export Keying Set to a python script" bl_idname = "anim.keying_set_export" bl_label = "Export Keying Set..." - filepath = bpy.props.StringProperty(name="File Path", description="Filepath to write file to.") + filepath = bpy.props.StringProperty(name="File Path", description="Filepath to write file to") filter_folder = bpy.props.BoolProperty(name="Filter folders", description="", default=True, options={'HIDDEN'}) filter_text = bpy.props.BoolProperty(name="Filter text", description="", default=True, options={'HIDDEN'}) filter_python = bpy.props.BoolProperty(name="Filter python", description="", default=True, options={'HIDDEN'}) def execute(self, context): if not self.filepath: - raise Exception("Filepath not set.") + raise Exception("Filepath not set") f = open(self.filepath, "w") if not f: - raise Exception("Could not open file.") + raise Exception("Could not open file") scene = context.scene ks = scene.keying_sets.active diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 67aca5eb4c1..3e3ca913e88 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1104,8 +1104,8 @@ class WM_OT_addon_enable(Operator): if info_ver > bpy.app.version: self.report({'WARNING'}, ("This script was written Blender " "version %d.%d.%d and might not " - "function (correctly).\n" - "The script is enabled though.") % + "function (correctly), " + "though it is enabled") % info_ver) return {'FINISHED'} else: diff --git a/release/scripts/templates/operator_export.py b/release/scripts/templates/operator_export.py index b1d53e6ee0c..3a7040ae2d2 100644 --- a/release/scripts/templates/operator_export.py +++ b/release/scripts/templates/operator_export.py @@ -41,7 +41,7 @@ class ExportSomeData(bpy.types.Operator, ExportHelper): name="Example Enum", description="Choose between two items", items=(('OPT_A', "First Option", "Description one"), - ('OPT_B', "Second Option", "Description two.")), + ('OPT_B', "Second Option", "Description two")), default='OPT_A', ) |