svn merge ^/trunk/blender -r41150:41175
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 05:00:53 +0000 (05:00 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 05:00:53 +0000 (05:00 +0000)
13 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_orientations.c
source/creator/CMakeLists.txt
source/creator/creator.c

index d223896924d7b8ef2e77e73b33bd6752f27ab12d,55f49654f3218062390f2e1fa929b069efd1e444..f5c886a031f579ab15ce9a4e633c3b686ad1d469
@@@ -491,20 -490,14 +485,20 @@@ void uiTemplateHeader3D(uiLayout *layou
        uiBlockSetEmboss(block, UI_EMBOSS);
        
        /* mode */
 -      if(ob)
 +      if(ob) {
 +              /*sanity point checkpoint, put here to avoid seeding
 +                this same code in 10 different other places.*/
 +              if (!ob->mode)
 +                      ob->mode = OB_MODE_OBJECT;
 +
                v3d->modeselect = ob->mode;
 -      else
 +      } else {
                v3d->modeselect = OB_MODE_OBJECT;
 -
 +      }
 +      
        uiBlockBeginAlign(block);
        uiDefIconTextButS(block, MENU, B_MODESELECT, object_mode_icon(v3d->modeselect), view3d_modeselect_pup(scene) , 
-                         0,0,126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, "Mode");
+                         0,0,126 * dpi_fac, UI_UNIT_Y, &(v3d->modeselect), 0, 0, 0, 0, TIP_("Mode"));
        uiBlockEndAlign(block);
        
        /* Draw type */
Simple merge
Simple merge