[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39391] branches/soc-2011-tomato: Merging r39330 through r39390 from trunk into soc-2011-tomato

Sergey Sharybin g.ulairi at gmail.com
Sun Aug 14 13:17:40 CEST 2011


Revision: 39391
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39391
Author:   nazgul
Date:     2011-08-14 11:17:39 +0000 (Sun, 14 Aug 2011)
Log Message:
-----------
Merging r39330 through r39390 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_logic.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_outliner.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/editors/armature/poseSlide.c
    branches/soc-2011-tomato/source/blender/editors/include/ED_node.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
    branches/soc-2011-tomato/source/blender/editors/render/render_update.c
    branches/soc-2011-tomato/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-tomato/source/blender/gpu/GPU_extensions.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_armature.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_multires.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_none.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shapekey.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_softbody.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_surface.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Light.cpp

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36831-39329
   + /trunk/blender:36831-39390

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py	2011-08-14 10:28:18 UTC (rev 39390)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py	2011-08-14 11:17:39 UTC (rev 39391)
@@ -73,7 +73,7 @@
         ob = context.object
         mesh = context.mesh
         space = context.space_data
-
+        layout.prop(context.scene.tool_settings, "mesh_select_mode", index=0, text="Vertex")
         if ob:
             layout.template_ID(ob, "data")
         elif mesh:

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py	2011-08-14 10:28:18 UTC (rev 39390)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py	2011-08-14 11:17:39 UTC (rev 39391)
@@ -577,13 +577,13 @@
         sub = col.column()
         sub.active = bool(md.vertex_group)
         sub.prop(md, "invert_vertex_group", text="Invert")
+        sub.prop(md, "thickness_vertex_group", text="Factor")
 
         col.prop(md, "use_even_offset")
         col.prop(md, "use_quality_normals")
         col.prop(md, "use_rim")
 
         sub = col.column()
-        sub.label()
         row = sub.split(align=True, percentage=0.4)
         row.prop(md, "material_offset", text="")
         row = row.row()

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py	2011-08-14 10:28:18 UTC (rev 39390)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_console.py	2011-08-14 11:17:39 UTC (rev 39391)
@@ -26,17 +26,14 @@
     bl_space_type = 'CONSOLE'
 
     def draw(self, context):
-        layout = self.layout
+        layout = self.layout.row(align=True)
 
-        row = layout.row(align=True)
-        row.template_header()
+        layout.template_header()
 
         if context.area.show_menus:
-            sub = row.row(align=True)
-            sub.menu("CONSOLE_MT_console")
+            layout.menu("CONSOLE_MT_console")
 
-        row = layout.row(align=True)
-        row.operator("console.autocomplete", text="Autocomplete")
+        layout.operator("console.autocomplete", text="Autocomplete")
 
 
 class CONSOLE_MT_console(Menu):
@@ -44,7 +41,7 @@
 
     def draw(self, context):
         layout = self.layout
-        layout.column()
+        
         layout.operator("console.clear")
         layout.operator("console.copy")
         layout.operator("console.paste")

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py	2011-08-14 10:28:18 UTC (rev 39390)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_dopesheet.py	2011-08-14 11:17:39 UTC (rev 39391)
@@ -97,21 +97,19 @@
         row.template_header()
 
         if context.area.show_menus:
-            sub = row.row(align=True)
+            row.menu("DOPESHEET_MT_view")
+            row.menu("DOPESHEET_MT_select")
+            row.menu("DOPESHEET_MT_marker")
 
-            sub.menu("DOPESHEET_MT_view")
-            sub.menu("DOPESHEET_MT_select")
-            sub.menu("DOPESHEET_MT_marker")
-
             if st.mode == 'DOPESHEET' or (st.mode == 'ACTION' and st.action != None):
-                sub.menu("DOPESHEET_MT_channel")
+                row.menu("DOPESHEET_MT_channel")
             elif st.mode == 'GPENCIL':
-                sub.menu("DOPESHEET_MT_gpencil_channel")
+                row.menu("DOPESHEET_MT_gpencil_channel")
 
             if st.mode != 'GPENCIL':
-                sub.menu("DOPESHEET_MT_key")
+                row.menu("DOPESHEET_MT_key")
             else:
-                sub.menu("DOPESHEET_MT_gpencil_frame")
+                row.menu("DOPESHEET_MT_gpencil_frame")
 
         layout.prop(st, "mode", text="")
         layout.prop(st.dopesheet, "show_summary", text="Summary")
@@ -143,8 +141,6 @@
 
         st = context.space_data
 
-        layout.column()
-
         layout.prop(st, "use_realtime_update")
         layout.prop(st, "show_frame_indicator")
         layout.prop(st, "show_sliders")
@@ -177,7 +173,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
         layout.operator("action.select_all_toggle")
         layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
@@ -217,7 +212,6 @@
 
         #layout.operator_context = 'EXEC_REGION_WIN'
 
-        layout.column()
         layout.operator("marker.add", "Add Marker")
         layout.operator("marker.duplicate", text="Duplicate Marker")
         layout.operator("marker.delete", text="Delete Marker")
@@ -246,7 +240,6 @@
 
         layout.operator_context = 'INVOKE_REGION_CHANNELS'
 
-        layout.column()
         layout.operator("anim.channels_delete")
 
         layout.separator()
@@ -275,7 +268,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         layout.menu("DOPESHEET_MT_key_transform", text="Transform")
 
         layout.operator_menu_enum("action.snap", "type", text="Snap")
@@ -308,7 +300,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         layout.operator("transform.transform", text="Grab/Move").mode = 'TIME_TRANSLATE'
         layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
         layout.operator("transform.transform", text="Slide").mode = 'TIME_SLIDE'
@@ -326,7 +317,6 @@
 
         layout.operator_context = 'INVOKE_REGION_CHANNELS'
 
-        layout.column()
         layout.operator("anim.channels_delete")
 
         layout.separator()
@@ -352,7 +342,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         layout.menu("DOPESHEET_MT_key_transform", text="Transform")
 
         #layout.operator_menu_enum("action.snap", "type", text="Snap")

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py	2011-08-14 10:28:18 UTC (rev 39390)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_graph.py	2011-08-14 11:17:39 UTC (rev 39391)
@@ -36,14 +36,12 @@
         row.template_header()
 
         if context.area.show_menus:
-            sub = row.row(align=True)
+            row.menu("GRAPH_MT_view")
+            row.menu("GRAPH_MT_select")
+            row.menu("GRAPH_MT_marker")
+            row.menu("GRAPH_MT_channel")
+            row.menu("GRAPH_MT_key")
 
-            sub.menu("GRAPH_MT_view")
-            sub.menu("GRAPH_MT_select")
-            sub.menu("GRAPH_MT_marker")
-            sub.menu("GRAPH_MT_channel")
-            sub.menu("GRAPH_MT_key")
-
         layout.prop(st, "mode", text="")
 
         dopesheet_filter(layout, context)
@@ -70,8 +68,6 @@
 
         st = context.space_data
 
-        layout.column()
-
         layout.operator("graph.properties", icon='MENU_PANEL')
         layout.separator()
 
@@ -114,7 +110,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
         layout.operator("graph.select_all_toggle")
         layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
@@ -151,7 +146,6 @@
 
         #layout.operator_context = 'EXEC_REGION_WIN'
 
-        layout.column()
         layout.operator("marker.add", "Add Marker")
         layout.operator("marker.duplicate", text="Duplicate Marker")
         layout.operator("marker.delete", text="Delete Marker")
@@ -172,7 +166,6 @@
 
         layout.operator_context = 'INVOKE_REGION_CHANNELS'
 
-        layout.column()
         layout.operator("anim.channels_delete")
 
         layout.separator()
@@ -202,7 +195,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         layout.menu("GRAPH_MT_key_transform", text="Transform")
 
         layout.operator_menu_enum("graph.snap", "type", text="Snap")
@@ -241,7 +233,6 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.column()
         layout.operator("transform.translate", text="Grab/Move")
         layout.operator("transform.transform", text="Extend").mode = 'TIME_EXTEND'
         layout.operator("transform.rotate", text="Rotate")

Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py	2011-08-14 10:28:18 UTC (rev 39390)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_image.py	2011-08-14 11:17:39 UTC (rev 39391)
@@ -452,16 +452,14 @@
         split = layout.split()
 
         col = split.column()
-
+        
+        col.prop(ima, "use_animation")
         sub = col.column(align=True)
-        sub.prop(ima, "use_animation")
+        sub.active = ima.use_animation
+        sub.prop(ima, "frame_start", text="Start")
+        sub.prop(ima, "frame_end", text="End")
+        sub.prop(ima, "fps", text="Speed")
 
-        subsub = sub.column()
-        subsub.active = ima.use_animation
-        subsub.prop(ima, "frame_start", text="Start")
-        subsub.prop(ima, "frame_end", text="End")
-        subsub.prop(ima, "fps", text="Speed")
-
         col.prop(ima, "use_tiles")
         sub = col.column(align=True)
         sub.active = ima.use_tiles or ima.use_animation
@@ -509,10 +507,11 @@
         layout = self.layout
 
         sima = context.space_data
+        

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list