Revision: 21534
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21534
Author:   imbusy
Date:     2009-07-11 20:46:37 +0200 (Sat, 11 Jul 2009)

Log Message:
-----------
merge from 21496 to 21532

Modified Paths:
--------------
    branches/soc-2009-imbusy/projectfiles_vc9/blender/blender.vcproj
    
branches/soc-2009-imbusy/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
    
branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-imbusy/release/ui/buttons_data_lamp.py
    branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
    branches/soc-2009-imbusy/release/ui/buttons_particle.py
    branches/soc-2009-imbusy/release/ui/space_sequencer.py
    branches/soc-2009-imbusy/source/blender/blenfont/BLF_api.h
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf.c
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf_font.c
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2009-imbusy/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_action.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_nla.h
    branches/soc-2009-imbusy/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/action.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/context.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/nla.c
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/object.c
    branches/soc-2009-imbusy/source/blender/blenlib/BLI_util.h
    branches/soc-2009-imbusy/source/blender/blenlib/intern/util.c
    branches/soc-2009-imbusy/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-imbusy/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_channels.c
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_deps.c
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_draw.c
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_markers.c
    branches/soc-2009-imbusy/source/blender/editors/animation/anim_ops.c
    branches/soc-2009-imbusy/source/blender/editors/animation/drivers.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyframes_edit.c
    
branches/soc-2009-imbusy/source/blender/editors/animation/keyframes_general.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyframing.c
    branches/soc-2009-imbusy/source/blender/editors/animation/keyingsets.c
    
branches/soc-2009-imbusy/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-imbusy/source/blender/editors/armature/poselib.c
    branches/soc-2009-imbusy/source/blender/editors/include/ED_anim_api.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_keyframes_draw.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_keyframing.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_object.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_screen.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_screen_types.h
    branches/soc-2009-imbusy/source/blender/editors/include/ED_transform.h
    branches/soc-2009-imbusy/source/blender/editors/include/UI_interface.h
    branches/soc-2009-imbusy/source/blender/editors/include/UI_view2d.h
    branches/soc-2009-imbusy/source/blender/editors/interface/interface.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_anim.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_layout.c
    
branches/soc-2009-imbusy/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-imbusy/source/blender/editors/interface/interface_style.c
    
branches/soc-2009-imbusy/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-imbusy/source/blender/editors/interface/resources.c
    branches/soc-2009-imbusy/source/blender/editors/interface/view2d.c
    branches/soc-2009-imbusy/source/blender/editors/interface/view2d_ops.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2009-imbusy/source/blender/editors/mesh/meshtools.c
    branches/soc-2009-imbusy/source/blender/editors/object/editconstraint.c
    branches/soc-2009-imbusy/source/blender/editors/object/object_edit.c
    branches/soc-2009-imbusy/source/blender/editors/object/object_intern.h
    branches/soc-2009-imbusy/source/blender/editors/object/object_ops.c
    branches/soc-2009-imbusy/source/blender/editors/physics/editparticle.c
    branches/soc-2009-imbusy/source/blender/editors/screen/screen_edit.c
    branches/soc-2009-imbusy/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2009-imbusy/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/action_select.c
    branches/soc-2009-imbusy/source/blender/editors/space_action/space_action.c
    
branches/soc-2009-imbusy/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/file_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_file/file_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_file/filesel.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_select.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/space_graph.c
    branches/soc-2009-imbusy/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_intern.h
    branches/soc-2009-imbusy/source/blender/editors/space_nla/space_nla.c
    branches/soc-2009-imbusy/source/blender/editors/space_node/node_edit.c
    branches/soc-2009-imbusy/source/blender/editors/space_node/node_select.c
    branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner.c
    
branches/soc-2009-imbusy/source/blender/editors/space_outliner/outliner_intern.h
    
branches/soc-2009-imbusy/source/blender/editors/space_sequencer/sequencer_edit.c
    
branches/soc-2009-imbusy/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_text/text_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_text/text_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_time/time_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform.h
    
branches/soc-2009-imbusy/source/blender/editors/transform/transform_conversions.c
    
branches/soc-2009-imbusy/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-imbusy/source/blender/editors/transform/transform_ops.c
    
branches/soc-2009-imbusy/source/blender/editors/transform/transform_orientations.c
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_action_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-imbusy/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2009-imbusy/source/blender/makesrna/RNA_access.h
    branches/soc-2009-imbusy/source/blender/makesrna/RNA_define.h
    branches/soc-2009-imbusy/source/blender/makesrna/RNA_types.h
    branches/soc-2009-imbusy/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-imbusy/source/blender/python/generic/Mathutils.h
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-imbusy/source/blender/python/intern/bpy_util.c
    branches/soc-2009-imbusy/source/blender/windowmanager/WM_types.h
    
branches/soc-2009-imbusy/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-imbusy/source/nan_definitions.mk

Added Paths:
-----------
    branches/soc-2009-imbusy/release/ui/space_view3d.py
    branches/soc-2009-imbusy/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2009-imbusy/source/blender/blenkernel/nla_private.h
    branches/soc-2009-imbusy/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2009-imbusy/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2009-imbusy/source/blender/editors/space_nla/nla_select.c
    branches/soc-2009-imbusy/source/blender/makesrna/intern/rna_nla.c

Modified: branches/soc-2009-imbusy/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/soc-2009-imbusy/projectfiles_vc9/blender/blender.vcproj    
2009-07-11 18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/projectfiles_vc9/blender/blender.vcproj    
2009-07-11 18:46:37 UTC (rev 21534)
@@ -209,39 +209,6 @@
        </References>
        <Files>
                <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-                       >
-                       <File
-                               RelativePath="..\..\source\creator\buildinfo.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\source\creator\creator.c"
-                               >
-                       </File>
-                       <File
-                               RelativePath="..\..\source\icons\winblender.rc"
-                               >
-                               <FileConfiguration
-                                       Name="Blender Release|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCResourceCompilerTool"
-                                               
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
-                                       />
-                               </FileConfiguration>
-                               <FileConfiguration
-                                       Name="Blender Debug|Win32"
-                                       >
-                                       <Tool
-                                               Name="VCResourceCompilerTool"
-                                               
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
-                                       />
-                               </FileConfiguration>
-                       </File>
-               </Filter>
-               <Filter
                        Name="Resource Files"
                        
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
                        >
@@ -253,6 +220,39 @@
                                
RelativePath="..\..\source\icons\winblenderfile.ico"
                                >
                        </File>
+                       <Filter
+                               Name="Source Files"
+                               Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+                               >
+                               <File
+                                       
RelativePath="..\..\source\creator\buildinfo.c"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\source\creator\creator.c"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\source\icons\winblender.rc"
+                                       >
+                                       <FileConfiguration
+                                               Name="Blender Release|Win32"
+                                               >
+                                               <Tool
+                                                       
Name="VCResourceCompilerTool"
+                                                       
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                                       <FileConfiguration
+                                               Name="Blender Debug|Win32"
+                                               >
+                                               <Tool
+                                                       
Name="VCResourceCompilerTool"
+                                                       
AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
+                                               />
+                                       </FileConfiguration>
+                               </File>
+                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"

Modified: 
branches/soc-2009-imbusy/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- 
branches/soc-2009-imbusy/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
  2009-07-11 18:39:07 UTC (rev 21533)
+++ 
branches/soc-2009-imbusy/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
  2009-07-11 18:46:37 UTC (rev 21534)
@@ -610,6 +610,10 @@
                                >
                        </File>
                        <File
+                               
RelativePath="..\..\..\source\blender\blenkernel\intern\fmodifier.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\blenkernel\intern\font.c"
                                >
                        </File>
@@ -1098,6 +1102,14 @@
                                
RelativePath="..\..\..\source\blender\blenkernel\depsgraph_private.h"
                                >
                        </File>
+                       <File
+                               
RelativePath="..\..\..\source\blender\blenkernel\Makefile"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\..\source\blender\blenkernel\nla_private.h"
+                               >
+                       </File>
                </Filter>
        </Files>
        <Globals>

Modified: 
branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj 
2009-07-11 18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/projectfiles_vc9/blender/editors/ED_editors.vcproj 
2009-07-11 18:46:37 UTC (rev 21534)
@@ -639,6 +639,10 @@
                                >
                        </File>
                        <File
+                               
RelativePath="..\..\..\source\blender\editors\space_graph\graph_utils.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\editors\space_graph\space_graph.c"
                                >
                        </File>
@@ -839,6 +843,22 @@
                        Name="space_nla"
                        >
                        <File
+                               
RelativePath="..\..\..\source\blender\editors\space_nla\nla_buttons.c"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\..\source\blender\editors\space_nla\nla_channels.c"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\..\source\blender\editors\space_nla\nla_draw.c"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\..\source\blender\editors\space_nla\nla_edit.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\editors\space_nla\nla_header.c"
                                >
                        </File>
@@ -847,6 +867,14 @@
                                >
                        </File>
                        <File
+                               
RelativePath="..\..\..\source\blender\editors\space_nla\nla_ops.c"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\..\source\blender\editors\space_nla\nla_select.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\editors\space_nla\space_nla.c"
                                >
                        </File>
@@ -999,6 +1027,10 @@
                                >
                        </File>
                        <File
+                               
RelativePath="..\..\..\source\blender\editors\animation\fmodifier_ui.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\editors\animation\keyframes_draw.c"
                                >
                        </File>

Modified: 
branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
===================================================================
--- 
branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj  
    2009-07-11 18:39:07 UTC (rev 21533)
+++ 
branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj  
    2009-07-11 18:46:37 UTC (rev 21534)
@@ -711,6 +711,10 @@
                                >
                        </File>
                        <File
+                               
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nla.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nodetree.c"
                                >
                        </File>

Modified: 
branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
===================================================================
--- branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj   
2009-07-11 18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj   
2009-07-11 18:46:37 UTC (rev 21534)
@@ -271,6 +271,10 @@
                                >
                        </File>
                        <File
+                               
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nla_gen.c"
+                               >
+                       </File>
+                       <File
                                
RelativePath="..\..\..\source\blender\makesrna\intern\rna_nodetree_gen.c"
                                >
                        </File>

Modified: branches/soc-2009-imbusy/release/ui/buttons_data_lamp.py
===================================================================
--- branches/soc-2009-imbusy/release/ui/buttons_data_lamp.py    2009-07-11 
18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/release/ui/buttons_data_lamp.py    2009-07-11 
18:46:37 UTC (rev 21534)
@@ -48,7 +48,7 @@
                
                lamp = context.lamp
 
-               layout.itemR(lamp, "type", expand=True)
+               layout.itemR(lamp, "type")
                
                split = layout.split()
                

Modified: branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py
===================================================================
--- branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py    
2009-07-11 18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/release/ui/buttons_object_constraint.py    
2009-07-11 18:46:37 UTC (rev 21534)
@@ -109,10 +109,9 @@
                sub.itemR(con, "sizey", text="Y")
                sub.itemR(con, "sizez", text="Z")
                
-               # Missing
                row = layout.row()
-               row.itemL(text="SET OFFSET")
-               row.itemL(text="CLEAR OFFSET")
+               row.itemO("CONSTRAINT_OT_childof_set_inverse")
+               row.itemO("CONSTRAINT_OT_childof_clear_inverse")
                
        def track_to(self, layout, con):
                self.target_template(layout, con)
@@ -122,6 +121,7 @@
                row.itemR(con, "track", expand=True)
                
                row = layout.row()
+               #row.itemR(con, "up", text="Up", expand=True) # XXX: up and 
expand don't play nice together
                row.itemR(con, "up", text="Up")
                row.itemR(con, "target_z")
                

Modified: branches/soc-2009-imbusy/release/ui/buttons_particle.py
===================================================================
--- branches/soc-2009-imbusy/release/ui/buttons_particle.py     2009-07-11 
18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/release/ui/buttons_particle.py     2009-07-11 
18:46:37 UTC (rev 21534)
@@ -20,7 +20,7 @@
 
 class PARTICLE_PT_particles(ParticleButtonsPanel):
        __idname__= "PARTICLE_PT_particles"
-       __label__ = " "
+       __no_header__ = True
 
        def poll(self, context):
                return (context.particle_system or context.object)

Modified: branches/soc-2009-imbusy/release/ui/space_sequencer.py
===================================================================
--- branches/soc-2009-imbusy/release/ui/space_sequencer.py      2009-07-11 
18:39:07 UTC (rev 21533)
+++ branches/soc-2009-imbusy/release/ui/space_sequencer.py      2009-07-11 
18:46:37 UTC (rev 21534)
@@ -242,7 +242,7 @@
                layout.itemO("SEQUENCER_OT_mute")
                layout.itemO("SEQUENCER_OT_unmute")
                
-               layout.item_enumO("SEQUENCER_OT_mute", property="type", 
value='UNSELECTED', text="Mute Deselected Strips")
+               layout.item_booleanO("SEQUENCER_OT_mute", "unselected", 1, 
text="Mute Deselected Strips")
 
                layout.itemO("SEQUENCER_OT_snap")
 

Copied: branches/soc-2009-imbusy/release/ui/space_view3d.py (from rev 21532, 
branches/blender2.5/blender/release/ui/space_view3d.py)
===================================================================
--- branches/soc-2009-imbusy/release/ui/space_view3d.py                         
(rev 0)
+++ branches/soc-2009-imbusy/release/ui/space_view3d.py 2009-07-11 18:46:37 UTC 
(rev 21534)
@@ -0,0 +1,106 @@
+
+import bpy
+
+class VIEW3D_MT_view_navigation(bpy.types.Menu):
+       __space_type__ = "VIEW_3D"
+       __label__ = "Navigation"
+
+       def draw(self, context):
+               layout = self.layout
+
+               # layout.itemO("VIEW3D_OT_view_fly_mode")
+               # layout.itemS()
+               
+               layout.items_enumO("VIEW3D_OT_view_orbit", "type")
+               
+               layout.itemS()
+               
+               layout.items_enumO("VIEW3D_OT_view_pan", "type")
+               
+               layout.itemS()
+               
+               layout.item_floatO("VIEW3D_OT_zoom", "delta", 1.0, text="Zoom 
In")
+               layout.item_floatO("VIEW3D_OT_zoom", "delta", -1.0, text="Zoom 
Out")
+
+class VIEW3D_MT_view(bpy.types.Menu):
+       __space_type__ = "VIEW_3D"
+       __label__ = "View"
+
+       def draw(self, context):
+               layout = self.layout
+
+               layout.itemO("VIEW3D_OT_properties", icon="ICON_MENU_PANEL")
+               layout.itemO("VIEW3D_OT_toolbar", icon="ICON_MENU_PANEL")
+               
+               layout.itemS()
+               
+               layout.item_enumO("VIEW3D_OT_viewnumpad", "type", "CAMERA")
+               layout.item_enumO("VIEW3D_OT_viewnumpad", "type", "TOP")
+               layout.item_enumO("VIEW3D_OT_viewnumpad", "type", "FRONT")

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to