archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge -r40295:40367 ^/trunk/blender

Browse Source
This commit is contained in:
Campbell Barton
2011-09-21 17:15:54 +00:00
parent b602024a26 d78231734d
commit 14475d07cd
191 changed files with 3268 additions and 1946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_operators/image.py
View File

@@ -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]

8
release/scripts/startup/bl_operators/object.py
View File

@@ -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:

12
release/scripts/startup/bl_operators/object_quick_effects.py
View File

@@ -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:

4
release/scripts/startup/bl_operators/sequencer.py
View File

@@ -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'}

4
release/scripts/startup/bl_operators/uvcalc_follow_active.py
View File

@@ -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

2
release/scripts/startup/bl_operators/uvcalc_lightmap.py
View File

@@ -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)

4
release/scripts/startup/bl_operators/uvcalc_smart_project.py
View File

@@ -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')

6
release/scripts/startup/bl_operators/wm.py
View File

@@ -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'}

3
release/scripts/startup/bl_ui/properties_data_curve.py
View File

@@ -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")

8
release/scripts/startup/bl_ui/properties_particle.py
View File

@@ -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)

8
release/scripts/startup/bl_ui/properties_scene.py
View File

@@ -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

4
release/scripts/startup/bl_ui/space_userpref.py
View File

@@ -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: