diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-10-06 12:02:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-10-06 12:02:35 +0400 |
commit | c9634ce5b40cc4344b189b607949d54183a7a398 (patch) | |
tree | d55102316578a929f742b430d18236361098f399 | |
parent | 6c2738ef48bdc7d535d858293a635a29b7269cf3 (diff) |
fix for [#17560] Error in BPY_run_python_script
any path starting with a '.' on win32 would be replaced with C:\ (or the default root)
this was added rev 6568 so the file selector would replace "." with C:\. should be moved to fileselector but for now compare with "." rather then checking the first char.
header_view3d.c - prop edit and render were aligning in curve edit mode.
-rw-r--r-- | source/blender/blenlib/intern/util.c | 5 | ||||
-rw-r--r-- | source/blender/src/header_view3d.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c index 9aba38b9bc2..013b9e0bb1b 100644 --- a/source/blender/blenlib/intern/util.c +++ b/source/blender/blenlib/intern/util.c @@ -893,7 +893,10 @@ void BLI_cleanup_file(const char *relabase, char *dir) */ #ifdef WIN32 - if(dir[0]=='.') { /* happens for example in FILE_MAIN */ + + /* Note, this should really be moved to the file selector, + * since this function is used in many areas */ + if(strcmp(dir, ".")==0) { /* happens for example in FILE_MAIN */ get_default_root(dir); return; } diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 9a2f907fa12..4cef7a1cb3e 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -5796,6 +5796,7 @@ void view3d_buttons(void) uiDefIconTextButS(block, ICONTEXTROW,B_REDR, ICON_SMOOTHCURVE, propfalloff_pup(), xco,0,XIC+10,YIC, &(G.scene->prop_mode), 0.0, 0.0, 0, 0, "Proportional Edit Falloff (Hotkey: Shift O) "); xco+= XIC+10; } + uiBlockEndAlign(block); xco+= 10; } @@ -5835,6 +5836,7 @@ void view3d_buttons(void) uiDefIconButBitS(block, TOG, V3D_ZBUF_SELECT, B_REDR, ICON_ORTHO, xco,0,XIC,YIC, &G.vd->flag, 1.0, 0.0, 0, 0, "Occlude background geometry"); xco+= XIC; } + uiBlockEndAlign(block); xco+= 20; } else if(G.f & G_PARTICLEEDIT) { @@ -5850,6 +5852,7 @@ void view3d_buttons(void) uiDefIconButBitS(block, TOG, V3D_ZBUF_SELECT, B_REDR, ICON_ORTHO, xco,0,XIC,YIC, &G.vd->flag, 1.0, 0.0, 0, 0, "Limit selection to visible (clipped with depth buffer)"); xco+= XIC; } + uiBlockEndAlign(block); xco+= 20; } |