diff options
author | Roel Spruit <roel@spruitje.nl> | 2004-07-21 23:01:44 +0400 |
---|---|---|
committer | Roel Spruit <roel@spruitje.nl> | 2004-07-21 23:01:44 +0400 |
commit | 1c5302e68b47c03fd60ab5edefb4a16d6294b7a7 (patch) | |
tree | 3ca149fff4f8d1918e4299fdd4a16940a04316e8 | |
parent | db4941128ebd421ec8efb51721fad03dcd751b64 (diff) |
added include path for some gameengine file and fixed an undefined function in the shading buttons
-rw-r--r-- | projectfiles/gameengine/ketsji/KX_ketsji.dsp | 4 | ||||
-rw-r--r-- | source/blender/src/buttons_shading.c | 77 |
2 files changed, 41 insertions, 40 deletions
diff --git a/projectfiles/gameengine/ketsji/KX_ketsji.dsp b/projectfiles/gameengine/ketsji/KX_ketsji.dsp index 2d0019bdf23..5813e20f598 100644 --- a/projectfiles/gameengine/ketsji/KX_ketsji.dsp +++ b/projectfiles/gameengine/ketsji/KX_ketsji.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\..\lib\windows\python\include\python2.3" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /YX /J /FD /c +# ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\extern\solid" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\Converter" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\..\lib\windows\python\include\python2.3" /I "..\..\..\source\blender\python" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /YX /J /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -68,7 +68,7 @@ LIB32=link.exe -lib # PROP Target_Dir "" LINK32=link.exe -lib # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.3" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\blender\python" /I "..\..\..\extern\solid" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /U "_DEBUG" /YX /J /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GR /GX /Zi /Od /I "..\..\..\..\lib\windows\python\include\python2.3" /I "..\..\..\source\gameengine\physics\BlOde" /I "..\..\..\source\blender\python" /I "..\..\..\extern\solid" /I "..\..\..\source\gameengine\physics\common\dummy" /I "..\..\..\..\lib\windows\string\include" /I "..\..\..\..\lib\windows\moto\include" /I "..\..\..\source\kernel\gen_system" /I "..\..\..\..\lib\windows\soundsystem\include" /I "..\..\..\source\gameengine\rasterizer" /I "..\..\..\source\gameengine\Converter" /I "..\..\..\source\gameengine\scenegraph" /I "..\..\..\source\gameengine\gamelogic" /I "..\..\..\source\gameengine\expressions" /I "..\..\..\source\sumo\include" /I "..\..\..\source\sumo\fuzzics\include" /I "..\..\..\source\gameengine\network" /I "..\..\..\source\gameengine\ketsji\kxnetwork" /I "..\..\..\source\gameengine\physics" /I "..\..\..\source\gameengine\physics\common" /I "..\..\..\source\gameengine\physics\dummy" /I "..\..\..\source\gameengine\physics\sumo" /I "..\..\..\source\gameengine\physics\sumo\fuzzics\include" /I "..\..\..\source\gameengine\physics\sumo\include" /D "JANCODEPANCO" /D "WIN32" /D "_MBCS" /D "_LIB" /D "EXP_PYTHON_EMBEDDING" /D "USE_SUMO_SOLID" /U "_DEBUG" /YX /J /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index fc965f9d886..2368af026c6 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -111,6 +111,45 @@ static MTex emptytex; static int packdummy = 0; +static char *mapto_blendtype_pup(void) +{ + static char string[1024]; + char formatstr[1024]; + char tempstr[1024]; + + strcpy(string, "Layer Blending Mode: %t"); + strcpy(formatstr, "|%s %%x%d"); + + sprintf(tempstr, formatstr, "Mix", MTEX_BLEND); + strcat(string, tempstr); + + //strcat(string, "|%l"); + + sprintf(tempstr, formatstr, "Add", MTEX_ADD); + strcat(string, tempstr); + sprintf(tempstr, formatstr, "Lighten", MTEX_LIGHT); + strcat(string, tempstr); + sprintf(tempstr, formatstr, "Screen", MTEX_SCREEN); + strcat(string, tempstr); + + //strcat(string, "|%l"); + + sprintf(tempstr, formatstr, "Subtract", MTEX_SUB); + strcat(string, tempstr); + sprintf(tempstr, formatstr, "Darken", MTEX_DARK); + strcat(string, tempstr); + sprintf(tempstr, formatstr, "Multiply", MTEX_MUL); + strcat(string, tempstr); + + //strcat(string, "|%l"); + + sprintf(tempstr, formatstr, "Difference", MTEX_DIFF); + strcat(string, tempstr); + sprintf(tempstr, formatstr, "Divide", MTEX_DIV); + strcat(string, tempstr); + + return (string); +} /* *************************** TEXTURE ******************************** */ Tex *cur_imatex=0; @@ -2331,45 +2370,7 @@ void do_matbuts(unsigned short event) } } -static char *mapto_blendtype_pup(void) -{ - static char string[1024]; - char formatstr[1024]; - char tempstr[1024]; - - strcpy(string, "Layer Blending Mode: %t"); - strcpy(formatstr, "|%s %%x%d"); - - sprintf(tempstr, formatstr, "Mix", MTEX_BLEND); - strcat(string, tempstr); - - //strcat(string, "|%l"); - - sprintf(tempstr, formatstr, "Add", MTEX_ADD); - strcat(string, tempstr); - sprintf(tempstr, formatstr, "Lighten", MTEX_LIGHT); - strcat(string, tempstr); - sprintf(tempstr, formatstr, "Screen", MTEX_SCREEN); - strcat(string, tempstr); - - //strcat(string, "|%l"); - - sprintf(tempstr, formatstr, "Subtract", MTEX_SUB); - strcat(string, tempstr); - sprintf(tempstr, formatstr, "Darken", MTEX_DARK); - strcat(string, tempstr); - sprintf(tempstr, formatstr, "Multiply", MTEX_MUL); - strcat(string, tempstr); - //strcat(string, "|%l"); - - sprintf(tempstr, formatstr, "Difference", MTEX_DIFF); - strcat(string, tempstr); - sprintf(tempstr, formatstr, "Divide", MTEX_DIV); - strcat(string, tempstr); - - return (string); -} static void material_panel_map_to(Material *ma) { |