kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for [#17560] Error in BPY_run_python_script

Browse Source 
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.
This commit is contained in:
Campbell Barton 2008-10-06 08:02:35 +00:00
parent 6c2738ef48
commit c9634ce5b4
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenlib/intern/util.c
View File

@ -893,7 +893,10 @@ void BLI_cleanup_file(const char *relabase, char *dir)
*/ */
#ifdef WIN32 #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); get_default_root(dir);
return; return;
} }

3
source/blender/src/header_view3d.c
View File

@ -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) "); 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; xco+= XIC+10;
} }
uiBlockEndAlign(block);
xco+= 10; 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"); 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; xco+= XIC;
} }
uiBlockEndAlign(block);
xco+= 20; xco+= 20;
} }
else if(G.f & G_PARTICLEEDIT) { 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)"); 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; xco+= XIC;
} }
uiBlockEndAlign(block);
xco+= 20; xco+= 20;
} }