[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40367] branches/soc-2011-garlic: Merging r40345 through r40365 from trunk into soc-2011-garlic
Sergey Sharybin
g.ulairi at gmail.com
Mon Sep 19 17:47:05 CEST 2011
Revision: 40367
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40367
Author: nazgul
Date: 2011-09-19 15:47:05 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Merging r40345 through r40365 from trunk into soc-2011-garlic
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40345
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40365
Modified Paths:
--------------
branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_types.py
branches/soc-2011-garlic/release/scripts/modules/console_python.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/image.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-garlic/release/scripts/templates/operator_export.py
branches/soc-2011-garlic/source/blender/blenfont/intern/blf_dir.c
branches/soc-2011-garlic/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-garlic/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-garlic/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2011-garlic/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-garlic/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2011-garlic/source/blender/editors/animation/drivers.c
branches/soc-2011-garlic/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2011-garlic/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-garlic/source/blender/editors/animation/keyframing.c
branches/soc-2011-garlic/source/blender/editors/animation/keyingsets.c
branches/soc-2011-garlic/source/blender/editors/armature/editarmature.c
branches/soc-2011-garlic/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-garlic/source/blender/editors/armature/poseSlide.c
branches/soc-2011-garlic/source/blender/editors/armature/poseobject.c
branches/soc-2011-garlic/source/blender/editors/curve/editcurve.c
branches/soc-2011-garlic/source/blender/editors/curve/editfont.c
branches/soc-2011-garlic/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-garlic/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_layout.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_ops.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_templates.c
branches/soc-2011-garlic/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh.c
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-garlic/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-garlic/source/blender/editors/mesh/meshtools.c
branches/soc-2011-garlic/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-garlic/source/blender/editors/object/object_constraint.c
branches/soc-2011-garlic/source/blender/editors/object/object_edit.c
branches/soc-2011-garlic/source/blender/editors/object/object_hook.c
branches/soc-2011-garlic/source/blender/editors/object/object_modifier.c
branches/soc-2011-garlic/source/blender/editors/object/object_ops.c
branches/soc-2011-garlic/source/blender/editors/object/object_relations.c
branches/soc-2011-garlic/source/blender/editors/object/object_select.c
branches/soc-2011-garlic/source/blender/editors/object/object_shapekey.c
branches/soc-2011-garlic/source/blender/editors/object/object_transform.c
branches/soc-2011-garlic/source/blender/editors/object/object_vgroup.c
branches/soc-2011-garlic/source/blender/editors/physics/particle_edit.c
branches/soc-2011-garlic/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-garlic/source/blender/editors/render/render_internal.c
branches/soc-2011-garlic/source/blender/editors/render/render_opengl.c
branches/soc-2011-garlic/source/blender/editors/render/render_shading.c
branches/soc-2011-garlic/source/blender/editors/screen/screen_ops.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-garlic/source/blender/editors/sound/sound_ops.c
branches/soc-2011-garlic/source/blender/editors/space_console/console_ops.c
branches/soc-2011-garlic/source/blender/editors/space_file/file_draw.c
branches/soc-2011-garlic/source/blender/editors/space_file/file_ops.c
branches/soc-2011-garlic/source/blender/editors/space_file/filesel.c
branches/soc-2011-garlic/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-garlic/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_image/image_ops.c
branches/soc-2011-garlic/source/blender/editors/space_info/info_ops.c
branches/soc-2011-garlic/source/blender/editors/space_info/info_report.c
branches/soc-2011-garlic/source/blender/editors/space_logic/logic_window.c
branches/soc-2011-garlic/source/blender/editors/space_nla/nla_channels.c
branches/soc-2011-garlic/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-garlic/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_select.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2011-garlic/source/blender/editors/space_text/text_ops.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_ops.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-garlic/source/blender/imbuf/SConscript
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_actuator_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_armature_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_controller_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_group.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_meta.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_pose_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_screen.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sensor_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sound.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_speaker.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_text_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-garlic/source/blender/python/generic/bgl.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Vector.c
Property Changed:
----------------
branches/soc-2011-garlic/
branches/soc-2011-garlic/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-garlic
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:37070-37405,38788-40344
+ /trunk/blender:37070-37405,38788-40365
Modified: branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -63,7 +63,7 @@
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 @@
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):
Modified: branches/soc-2011-garlic/release/scripts/modules/bpy_extras/io_utils.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/modules/bpy_extras/io_utils.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/modules/bpy_extras/io_utils.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -233,8 +233,8 @@
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,
Modified: branches/soc-2011-garlic/release/scripts/modules/bpy_types.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/modules/bpy_types.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/modules/bpy_types.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -206,7 +206,7 @@
@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)
Modified: branches/soc-2011-garlic/release/scripts/modules/console_python.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/modules/console_python.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/modules/console_python.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -299,7 +299,7 @@
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
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_operators/image.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_operators/image.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_operators/image.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -74,7 +74,7 @@
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]
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_operators/object.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_operators/object.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -283,11 +283,11 @@
),
('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 @@
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 @@
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:
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_quick_effects.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_quick_effects.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_quick_effects.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -77,7 +77,7 @@
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 @@
fade = BoolProperty(
name="Fade",
- description="Fade the pieces over time.",
+ description="Fade the pieces over time",
default=True,
)
@@ -307,7 +307,7 @@
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 @@
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 @@
)
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 @@
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:
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_operators/sequencer.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_operators/sequencer.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_operators/sequencer.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -51,7 +51,7 @@
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 @@
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'}
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_follow_active.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2011-09-19 15:36:30 UTC (rev 40366)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_follow_active.py 2011-09-19 15:47:05 UTC (rev 40367)
@@ -140,7 +140,7 @@
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 @@
break
if face_act_local_index == -1:
- operator.report({'ERROR'}, "Active face not selected.")
+ operator.report({'ERROR'}, "Active face not selected")
return
# Modes
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_lightmap.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list