griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Editmesh spliting project files fix (MSVC 6.0)

Browse Source
This commit is contained in:
Martin Poirier
2004-09-19 14:33:33 +00:00
parent 3b065f929e
commit 143f0edc32
2 changed files with 34 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
projectfiles/blender/src/BL_src.dsp
View File

@@ -271,6 +271,26 @@ SOURCE=..\..\..\source\blender\src\editmesh.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\editmesh_add.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\editmesh_lib.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\editmesh_loop.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\editmesh_mods.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\editmesh_tools.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\editnla.c
# End Source File
# Begin Source File
@@ -407,6 +427,10 @@ SOURCE=..\..\..\source\blender\src\mainqueue.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\meshtools.c
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\mywindow.c
# End Source File
# Begin Source File
@@ -527,6 +551,10 @@ SOURCE=..\..\..\source\blender\include\BIF_editfont.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\include\BIF_editmesh.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\include\BIF_editoops.h
# End Source File
# Begin Source File
@@ -567,6 +595,10 @@ SOURCE=..\..\..\source\blender\include\butspace.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\include\editmesh.h
# End Source File
# Begin Source File
SOURCE=..\..\..\source\blender\src\winlay.h
# End Source File
# End Group

61
source/blender/src/header_info.c
View File

@@ -1203,58 +1203,6 @@ static uiBlock *info_add_metamenu(void *arg_unused)
return block;
}
void do_info_add_lampmenu(void *arg, int event)
{
switch(event) {
case 0: /* lamp */
add_objectLamp(LA_LOCAL);
break;
case 1: /* sun */
add_objectLamp(LA_SUN);
break;
case 2: /* spot */
add_objectLamp(LA_SPOT);
break;
case 3: /* hemi */
add_objectLamp(LA_HEMI);
break;
case 4: /* area */
add_objectLamp(LA_AREA);
break;
case 5: /* YafRay photon lamp */
if (G.scene->r.renderer==R_YAFRAY)
add_objectLamp(LA_YF_PHOTON);
break;
default:
break;
}
allqueue(REDRAWINFO, 0);
}
static uiBlock *info_add_lampmenu(void *arg_unused)
{
/* static short tog=0; */
uiBlock *block;
short yco= 0;
block= uiNewBlock(&curarea->uiblocks, "add_lampmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
uiBlockSetButmFunc(block, do_info_add_lampmenu, NULL);
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lamp|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Sun|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 1, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Spot|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 2, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Hemi|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 3, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Area|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 4, "");
if (G.scene->r.renderer==R_YAFRAY)
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Photon|", 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 5, "");
uiBlockSetDirection(block, UI_RIGHT);
uiTextBoundsBlock(block, 50);
return block;
}
void do_info_addmenu(void *arg, int event)
{
switch(event) {
@@ -1284,7 +1232,7 @@ void do_info_addmenu(void *arg, int event)
break;
case 7:
/* Lamp */
// add_object_draw(OB_LAMP);
add_object_draw(OB_LAMP);
break;
case 8:
/* Armature */
@@ -1316,15 +1264,10 @@ static uiBlock *info_addmenu(void *arg_unused)
uiDefIconTextBlockBut(block, info_add_metamenu, NULL, ICON_RIGHTARROW_THIN, "Meta", 0, yco-=20, 120, 19, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Text", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 4, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Empty", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 5, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 6, "");
// uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lamp", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 7, "");
uiDefIconTextBlockBut(block, info_add_lampmenu, NULL, ICON_RIGHTARROW_THIN, "Lamp", 0, yco-=20, 120, 19, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lamp", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 7, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
/* armature needs 3d window to draw */
//uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Armature", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 8, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Lattice", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 9, "");