[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38741] branches/vgroup_modifiers: Merging r38694 through r38739 from trunk into vgroup_modifiers

Bastien Montagne montagne29 at wanadoo.fr
Tue Jul 26 20:28:43 CEST 2011


Revision: 38741
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38741
Author:   mont29
Date:     2011-07-26 18:28:43 +0000 (Tue, 26 Jul 2011)
Log Message:
-----------
Merging r38694 through r38739 from trunk into vgroup_modifiers

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38694
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38739

Modified Paths:
--------------
    branches/vgroup_modifiers/doc/python_api/examples/mathutils.Vector.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/text.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
    branches/vgroup_modifiers/source/blender/editors/object/object_add.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_edit.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_generics.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_snap.c
    branches/vgroup_modifiers/source/blender/editors/util/undo.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_object_api.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm.c
    branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
    branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm.c
    branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/vgroup_modifiers/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Added Paths:
-----------
    branches/vgroup_modifiers/release/scripts/templates/ui_menu.py
    branches/vgroup_modifiers/release/scripts/templates/ui_menu_simple.py
    branches/vgroup_modifiers/release/scripts/templates/ui_panel_simple.py

Removed Paths:
-------------
    branches/vgroup_modifiers/release/scripts/templates/panel_simple.py

Property Changed:
----------------
    branches/vgroup_modifiers/
    branches/vgroup_modifiers/intern/audaspace/OpenAL/
    branches/vgroup_modifiers/release/scripts/modules/bpy/ops.py
    branches/vgroup_modifiers/release/scripts/modules/bpy/utils.py
    branches/vgroup_modifiers/release/scripts/presets/sss/chicken.py
    branches/vgroup_modifiers/release/scripts/presets/sss/cream.py
    branches/vgroup_modifiers/release/scripts/presets/sss/ketchup.py
    branches/vgroup_modifiers/release/scripts/presets/sss/marble.py
    branches/vgroup_modifiers/release/scripts/presets/sss/potato.py
    branches/vgroup_modifiers/release/scripts/presets/sss/skim_milk.py
    branches/vgroup_modifiers/release/scripts/presets/sss/skin1.py
    branches/vgroup_modifiers/release/scripts/presets/sss/skin2.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_material.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_particle.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_texture.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_world.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_customdata_file.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/customdata_file.c
    branches/vgroup_modifiers/source/blender/editors/datafiles/startup.blend.c
    branches/vgroup_modifiers/source/blender/editors/include/ED_particle.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_physics.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_render.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_transform.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface_intern.h
    branches/vgroup_modifiers/source/blender/editors/mesh/mesh_data.c
    branches/vgroup_modifiers/source/blender/editors/metaball/mball_edit.c
    branches/vgroup_modifiers/source/blender/editors/object/object_add.c
    branches/vgroup_modifiers/source/blender/editors/object/object_constraint.c
    branches/vgroup_modifiers/source/blender/editors/object/object_group.c
    branches/vgroup_modifiers/source/blender/editors/object/object_hook.c
    branches/vgroup_modifiers/source/blender/editors/object/object_lattice.c
    branches/vgroup_modifiers/source/blender/editors/object/object_relations.c
    branches/vgroup_modifiers/source/blender/editors/object/object_select.c
    branches/vgroup_modifiers/source/blender/editors/object/object_shapekey.c
    branches/vgroup_modifiers/source/blender/editors/object/object_transform.c
    branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
    branches/vgroup_modifiers/source/blender/editors/physics/particle_boids.c
    branches/vgroup_modifiers/source/blender/editors/physics/particle_edit.c
    branches/vgroup_modifiers/source/blender/editors/physics/physics_fluid.c
    branches/vgroup_modifiers/source/blender/editors/physics/physics_pointcache.c
    branches/vgroup_modifiers/source/blender/editors/render/
    branches/vgroup_modifiers/source/blender/editors/render/render_intern.h
    branches/vgroup_modifiers/source/blender/editors/render/render_preview.c
    branches/vgroup_modifiers/source/blender/editors/render/render_shading.c
    branches/vgroup_modifiers/source/blender/editors/render/render_update.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
    branches/vgroup_modifiers/source/blender/editors/space_image/image_buttons.c
    branches/vgroup_modifiers/source/blender/editors/space_info/info_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_state.c
    branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_userpref/
    branches/vgroup_modifiers/source/blender/editors/space_userpref/space_userpref.c
    branches/vgroup_modifiers/source/blender/editors/space_userpref/userpref_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_userpref/userpref_ops.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_buttons.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_intern.h
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/vgroup_modifiers/source/blender/gpu/GPU_buffers.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_outliner_types.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_sculpt_paint.c


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/blender:38694-38739

Modified: branches/vgroup_modifiers/doc/python_api/examples/mathutils.Vector.py
===================================================================
--- branches/vgroup_modifiers/doc/python_api/examples/mathutils.Vector.py	2011-07-26 18:28:07 UTC (rev 38740)
+++ branches/vgroup_modifiers/doc/python_api/examples/mathutils.Vector.py	2011-07-26 18:28:43 UTC (rev 38741)
@@ -1,15 +1,15 @@
 import mathutils
 
 # zero length vector
-vec = mathutils.Vector((0, 0, 1))
+vec = mathutils.Vector((0.0, 0.0, 1.0))
 
 # unit length vector
 vec_a = vec.copy().normalize()
 
-vec_b = mathutils.Vector((0, 1, 2))
+vec_b = mathutils.Vector((0.0, 1.0, 2.0))
 
-vec2d = mathutils.Vector((1, 2))
-vec3d = mathutils.Vector((1, 0, 0))
+vec2d = mathutils.Vector((1.0, 2.0))
+vec3d = mathutils.Vector((1.0, 0.0, 0.0))
 vec4d = vec_a.to_4d()
 
 # other mathutuls types
@@ -34,9 +34,9 @@
 vec_a - vec_b
 vec_a * vec_b
 vec_a * 10.0
-vec_a * matrix
+matrix * vec_a
+quat * vec_a
 vec_a * vec_b
-vec_a * quat
 -vec_a
 
 
@@ -44,6 +44,7 @@
 x = vec_a[0]
 len(vec)
 vec_a[:] = vec_b
+vec_a[:] = 1.0, 2.0, 3.0
 vec2d[:] = vec3d[:2]
 
 


Property changes on: branches/vgroup_modifiers/intern/audaspace/OpenAL
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
   + /branches/soc-2011-pepper/intern/audaspace/OpenAL:38630
/trunk/blender/intern/audaspace/OpenAL:38694-38739


Property changes on: branches/vgroup_modifiers/release/scripts/modules/bpy/ops.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/modules/bpy/utils.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/chicken.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/cream.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/ketchup.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/marble.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/potato.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/skim_milk.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/skin1.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/presets/sss/skin2.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_mesh.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_metaball.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_game.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_material.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_particle.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_field.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_fluid.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_physics_smoke.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_texture.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_world.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 


Property changes on: branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
___________________________________________________________________
Deleted: svn:mergeinfo
   - 

Modified: branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py
===================================================================
--- branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py	2011-07-26 18:28:07 UTC (rev 38740)
+++ branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_text.py	2011-07-26 18:28:43 UTC (rev 38741)
@@ -16,7 +16,7 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-# <pep8 compliant>
+# <pep8-80 compliant>
 import bpy
 
 
@@ -36,10 +36,13 @@
             sub = row.row(align=True)
             sub.menu("TEXT_MT_view")
             sub.menu("TEXT_MT_text")
+
             if text:
                 sub.menu("TEXT_MT_edit")
                 sub.menu("TEXT_MT_format")
 
+            sub.menu("TEXT_MT_templates")
+
         if text and text.is_modified:
             row = layout.row()
             row.alert = True
@@ -63,11 +66,13 @@
             row = layout.row()
             if text.filepath:
                 if text.is_dirty:
-                    row.label(text="File: *%s (unsaved)" % text.filepath)
+                    row.label(text="File: *%r (unsaved)" % text.filepath)
                 else:
-                    row.label(text="File: %s" % text.filepath)
+                    row.label(text="File: %r" % text.filepath)
             else:
-                row.label(text="Text: External" if text.library else "Text: Internal")
+                row.label(text="Text: External"
+                          if text.library
+                          else "Text: Internal")
 
 
 class TEXT_PT_properties(bpy.types.Panel):
@@ -150,8 +155,12 @@
 
         layout.separator()
 
-        layout.operator("text.move", text="Top of File").type = 'FILE_TOP'
-        layout.operator("text.move", text="Bottom of File").type = 'FILE_BOTTOM'
+        layout.operator("text.move",
+                        text="Top of File",
+                        ).type = 'FILE_TOP'
+        layout.operator("text.move",
+                        text="Bottom of File",
+                        ).type = 'FILE_BOTTOM'
 
 
 class TEXT_MT_text(bpy.types.Menu):
@@ -185,19 +194,15 @@
             # XXX   uiMenuItemO(head, 0, "text.refresh_pyconstraints");
             #endif
 
-        layout.separator()
 
-        layout.menu("TEXT_MT_templates")
-
-
 class TEXT_MT_templates(bpy.types.Menu):
-    '''
-    Creates the menu items by scanning scripts/templates
-    '''
-    bl_label = "Script Templates"
+    bl_label = "Templates"
 
     def draw(self, context):
-        self.path_menu(bpy.utils.script_paths("templates"), "text.open", {"internal": True})
+        self.path_menu(bpy.utils.script_paths("templates"),
+                       "text.open",
+                       {"internal": True},
+                       )
 
 
 class TEXT_MT_edit_select(bpy.types.Menu):
@@ -246,8 +251,12 @@
     def draw(self, context):

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list