bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

sgefants patch to remove the License Key stuff.

Browse Source 
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...

(Using cscope for LICENSE_KEY_VALID still turns up some stuff)

Kent
--
mein@cs.umn.edu
This commit is contained in:
Kent Mein 2002-12-06 19:48:37 +00:00
parent fd05cdbaad
commit cd4a60f536
17 changed files with 1022 additions and 1218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/SoundSystem/intern/SND_Utils.cpp
View File

@ -58,9 +58,6 @@ extern "C" {
#include <unistd.h>
#endif
//extern int LICENSE_KEY_VALID;
#define LICENSE_KEY_VALID true
#define BUFFERSIZE 32
@ -171,11 +168,8 @@ bool SND_IsSampleValid(const STR_String& name, void* memlocation)
/* only fmod supports compressed wav */
#ifdef USE_FMOD
/* and only valid publishers may use compressed wav */
if (LICENSE_KEY_VALID)
switch (shortbuf)
{
switch (shortbuf)
{
case SND_WAVE_FORMAT_ADPCM:
case SND_WAVE_FORMAT_ALAW:
case SND_WAVE_FORMAT_MULAW:
@ -189,18 +183,17 @@ bool SND_IsSampleValid(const STR_String& name, void* memlocation)
{
break;
}
}
}
#endif
}
#ifdef USE_FMOD
/* only valid publishers may use ogg vorbis */
else if (!memcmp(buffer, "OggS", 4) && LICENSE_KEY_VALID)
else if (!memcmp(buffer, "OggS", 4))
{
result = true;
}
/* only valid publishers may use mp3 */
else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2))) && LICENSE_KEY_VALID)
else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2))))
{
result = true;
}

4
source/blender/blenloader/intern/writefile.c
View File

@ -219,8 +219,6 @@ static void writedata_free(WriteData *wd)
struct streamGlueControlStruct *Global_streamGlueControl;
int mywfile;
#include "license_key.h"
/**
* Low level WRITE(2) wrapper that buffers data
* @param adr Pointer to new chunk of data
@ -264,7 +262,7 @@ bgnwrite(
int file,
int write_flags)
{
int is_publisher= ((write_flags & (G_FILE_COMPRESS | G_FILE_LOCK | G_FILE_SIGN | G_FILE_PUBLISH)) && LICENSE_KEY_VALID);
int is_publisher= (write_flags & (G_FILE_COMPRESS | G_FILE_LOCK | G_FILE_SIGN | G_FILE_PUBLISH));
WriteData *wd= writedata_new(file, is_publisher);
if (is_publisher) {

10
source/blender/imbuf/IMB_imbuf.h
View File

@ -311,20 +311,10 @@ struct ImBuf *IMB_scalefastImBuf(struct ImBuf *ibuf, short newx, short newy);
*/
short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags);
/**
* This function pointer needs to be initialized to enable
* png writing from the ImBuf library.
*
* @attention Defined in writeimage.c
* @attention See also IMB_png_encode()
*/
extern short (*IMB_fp_png_encode)(struct ImBuf *ibuf, int file, int flags);
/**
* Encodes a png image from an ImBuf
*
* @attention Defined in png_encode.c
* @attention See also IMB_fp_png_encode
*/
short IMB_png_encode(struct ImBuf *ibuf, int file, int flags);

8
source/blender/imbuf/intern/writeimage.c
View File

@ -58,10 +58,8 @@
#endif
short (*IMB_fp_png_encode)(struct ImBuf *ibuf, int file, int flags) = 0;
short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags)
{
{
short ok=TRUE,delpl=FALSE;
int file = -1;
@ -81,8 +79,8 @@ short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags)
}
}
if (IS_png(ibuf) && IMB_fp_png_encode) {
ok = IMB_fp_png_encode(ibuf,file,flags);
if (IS_png(ibuf)) {
ok = IMB_png_encode(ibuf,file,flags);
if (ok) {
close (file);
return (ok);

52
source/blender/src/buttons.c
View File

@ -151,9 +151,6 @@
#include "BIF_writeimage.h"
#include "BIF_writeavicodec.h"
#include "license_key.h"
extern int LICENSE_KEY_VALID;
/* 'old' stuff": defines and types ------------------------------------- */
#include "blendef.h"
#include "interface.h"
@ -4694,7 +4691,7 @@ void soundbuts(void)
uiDefButI(block, TOG|BIT|SOUND_FLAGS_LOOP_BIT, B_SOUND_REDRAW, "Loop",
xco, yco, 95, 24, &sound->flags, 0.0, 0.0, 0, 0,"Toggle between looping on/off");
if (sound->flags & SOUND_FLAGS_LOOP && LICENSE_KEY_VALID)
if (sound->flags & SOUND_FLAGS_LOOP)
{
xco += 100;
uiDefButI(block, TOG|BIT|SOUND_FLAGS_BIDIRECTIONAL_LOOP_BIT, B_SOUND_REDRAW, "Ping Pong",
@ -6270,43 +6267,28 @@ static char *imagetype_pup(void)
strcat(formatstring, "|%s %%x%d"); // add space for Movie
#endif
if (LICENSE_KEY_VALID) {
strcat(formatstring, "|%s %%x%d"); // add space for PNG
strcat(formatstring, "|%s %%x%d"); // add space for PNG
#ifdef _WIN32
strcat(formatstring, "|%s %%x%d"); // add space for AVI Codec
strcat(formatstring, "|%s %%x%d"); // add space for AVI Codec
#endif
sprintf(string, formatstring,
"AVI Raw", R_AVIRAW,
"AVI Jpeg", R_AVIJPEG,
sprintf(string, formatstring,
"AVI Raw", R_AVIRAW,
"AVI Jpeg", R_AVIJPEG,
#ifdef _WIN32
"AVI Codec", R_AVICODEC,
"AVI Codec", R_AVICODEC,
#endif
"Targa", R_TARGA,
"Targa Raw", R_RAWTGA,
"PNG", R_PNG,
"Jpeg", R_JPEG90,
"HamX", R_HAMX,
"Iris", R_IRIS,
"Iris + Zbuffer", R_IRIZ,
"Ftype", R_FTYPE,
"Movie", R_MOVIE
);
} else {
sprintf(string, formatstring,
"AVI Raw", R_AVIRAW,
"AVI Jpeg", R_AVIJPEG,
"Targa", R_TARGA,
"Targa Raw", R_RAWTGA,
"Jpeg", R_JPEG90,
"HamX", R_HAMX,
"Iris", R_IRIS,
"Iris + Zbuffer", R_IRIZ,
"Ftype", R_FTYPE,
"Movie", R_MOVIE
);
}
"Targa", R_TARGA,
"Targa Raw", R_RAWTGA,
"PNG", R_PNG,
"Jpeg", R_JPEG90,
"HamX", R_HAMX,
"Iris", R_IRIS,
"Iris + Zbuffer", R_IRIZ,
"Ftype", R_FTYPE,
"Movie", R_MOVIE
);
return (string);
}

2
source/blender/src/cre/license_key.c
View File

@ -190,7 +190,7 @@ void create_key_name(char * keyname)
void checkhome()
{
initprot(); // initialize module and function tables
IMB_fp_png_encode = IMB_png_encode;
}
void SHOW_LICENSE_KEY(void)

1968
source/blender/src/editnla.c
View File

File diff suppressed because it is too large Load Diff

7
source/blender/src/editobject.c
View File

@ -158,9 +158,6 @@
#include "DNA_armature_types.h"
#include "BIF_poseobject.h"
#include "license_key.h" // For functions behind the key
/* extern Lattice *copy_lattice(Lattice *lt); */
extern ListBase editNurb;
extern ListBase editelems;
@ -1456,8 +1453,8 @@ void special_editmenu(void)
// Get the active object mesh.
Mesh *me= get_mesh(OBACT);
// If the active object is a mesh and license key valid..
if(me && LICENSE_KEY_VALID) {
// If the active object is a mesh...
if (me) {
// Bring up a little menu with the boolean operation choices on.
nr= pupmenu("Boolean %t|Intersect%x1|Union%x2|Difference%x3");

46
source/blender/src/editsca.c
View File

@ -88,9 +88,6 @@
#include "interface.h"
#include "nla.h" /* For __NLA : Important, do not remove */
#include "license_key.h"
extern int LICENSE_KEY_VALID;
#define B_DIFF 1
#define B_ADD_PROP 2701
#define B_CHANGE_PROP 2702
@ -694,39 +691,20 @@ static char *actuator_name(int type)
static char *actuator_pup(Object *owner)
{
if (LICENSE_KEY_VALID)
switch (owner->type)
{
switch (owner->type)
{
case OB_ARMATURE:
return "Actuators %t|Action %x15|Motion %x0|Constraint %x9|Ipo %x1"
"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
"|Visibility %x18";
break;
default:
return "Actuators %t|Motion %x0|Constraint %x9|Ipo %x1"
"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
"|Visibility %x18";
}
case OB_ARMATURE:
return "Actuators %t|Action %x15|Motion %x0|Constraint %x9|Ipo %x1"
"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
"|Visibility %x18";
break;
default:
return "Actuators %t|Motion %x0|Constraint %x9|Ipo %x1"
"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
"|Scene %x11|Random %x13|Message %x14|CD %x16|Game %x17"
"|Visibility %x18";
}
else
{
switch (owner->type)
{
case OB_ARMATURE:
return "Actuators %t|Action %x15|Motion %x0|Constraint %x9|Ipo %x1"
"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
"|Scene %x11|Random %x13|Message %x14|Visibility %x18";
break;
default:
return "Actuators %t|Motion %x0|Constraint %x9|Ipo %x1"
"|Camera %x3|Sound %x5|Property %x6|Edit Object %x10"
"|Scene %x11|Random %x13|Message %x14|Visibility %x18";
}
}
}

12
source/blender/src/editscreen.c
View File

@ -96,7 +96,6 @@
#include "BSE_headerbuttons.h"
#include "BSE_view.h"
#include "license_key.h"
#include "interface.h"
#include "mydevice.h"
#include "blendef.h"
@ -1076,15 +1075,8 @@ void screenmain(void)
if (! ((G.main->versionfile >= G.version)
|| G.save_over)) {
if (LICENSE_KEY_VALID) {
splash((void *)datatoc_ton,
datatoc_tonize,
NULL);
} else {
splash((void *)datatoc_splash_jpg,
datatoc_splash_jpg_size,
NULL);
}
splash((void *)datatoc_ton,
datatoc_tonize, NULL);
}
}
firsttime = 0;

43
source/blender/src/editsound.c
View File

@ -81,10 +81,6 @@
#include "SYS_System.h"
#include "license_key.h"
extern int LICENSE_KEY_VALID;
/* this might move to the external header */
void* sound_get_libraryinterface(void);
@ -471,37 +467,32 @@ int sound_get_filetype_from_header(bSound* sound, PackedFile* pf)
#ifdef USE_FMOD
{
/* and only valid publishers may use compressed wav */
if (LICENSE_KEY_VALID)
switch (shortbuf)
{
switch (shortbuf)
{
case SND_WAVE_FORMAT_ADPCM:
case SND_WAVE_FORMAT_ALAW:
case SND_WAVE_FORMAT_MULAW:
case SND_WAVE_FORMAT_DIALOGIC_OKI_ADPCM:
case SND_WAVE_FORMAT_CONTROL_RES_VQLPC:
case SND_WAVE_FORMAT_GSM_610:
case SND_WAVE_FORMAT_MPEG3:
filetype = SAMPLE_WAV;
break;
default:
case SND_WAVE_FORMAT_ADPCM:
case SND_WAVE_FORMAT_ALAW:
case SND_WAVE_FORMAT_MULAW:
case SND_WAVE_FORMAT_DIALOGIC_OKI_ADPCM:
case SND_WAVE_FORMAT_CONTROL_RES_VQLPC:
case SND_WAVE_FORMAT_GSM_610:
case SND_WAVE_FORMAT_MPEG3:
filetype = SAMPLE_WAV;
break;
default:
#endif
{
filetype = SAMPLE_INVALID;
if (G.f & G_DEBUG) printf("Unsupported wav compression\n");
}
{
filetype = SAMPLE_INVALID;
if (G.f & G_DEBUG) printf("Unsupported wav compression\n");
}
#ifdef USE_FMOD
}
#ifdef USE_FMOD
}
}
/* only valid publishers may use ogg vorbis */
else if (!memcmp(buffer, "OggS", 4) && LICENSE_KEY_VALID)
else if (!memcmp(buffer, "OggS", 4))
{
filetype = SAMPLE_OGG_VORBIS;
}
/* only valid publishers may use mp3 */
else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2))) && LICENSE_KEY_VALID)
else if ((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "ÿû", 2)))
{
filetype = SAMPLE_MP3;
}

50
source/blender/src/headerbuttons.c
View File

@ -174,11 +174,6 @@
#include "TPT_DependKludge.h"
/* these are needed to hide functions behind function tables,
which are initialized by the python key code */
#include "keyed_functions.h"
#include "license_key.h"
/* local (?) functions */
void do_file_buttons(short event);
void do_text_buttons(unsigned short event);
@ -206,7 +201,6 @@ static void test_idbutton_cb(void *namev, void *arg2_unused)
#include "SYS_System.h"
#include "license_key.h"
static int std_libbuttons(uiBlock *block,
int xco, int pin, short *pinpoin,
int browse, ID *id, ID *parid,
@ -1292,11 +1286,7 @@ void do_global_buttons(unsigned short event)
SYS_WriteCommandLineInt(SYS_GetSystem(), "noaudio", (U.gameflags & USERDEF_DISABLE_SOUND));
break;
case B_SHOWSPLASH:
if ((LICENSE_KEY_VALID) && ((G.qual & LR_SHIFTKEY) == 0)) {
SHOW_LICENSE_KEY();
} else {
show_splash();
}
show_splash();
break;
case B_MIPMAPCHANGED:
set_mipmap(!(U.gameflags & USERDEF_DISABLE_SOUND));
@ -2145,27 +2135,27 @@ int make_beautiful_animation(void *vp)
return 0;
}
/*
int make_nice_software(void)
{
Fptr f = KEY_RETURN_TRUE;
if (f) return f(0);
else return 0;
}
*/
static void write_runtime_check_dynamic(char *str)
{
Fptr f = KEY_WRITE_RUNTIME;
struct twostrings twostrings;
twostrings.outname = str;
twostrings.exename = "blenderdynplayer.exe";
if (f) f((void *) &twostrings);
make_beautiful_animation((void *) &twostrings);
}
static void write_runtime_check(char *str)
{
Fptr f = KEY_WRITE_RUNTIME;
struct twostrings twostrings;
char player[128];
@ -2182,7 +2172,7 @@ static void write_runtime_check(char *str)
strcat(player, ".app");
#endif
if (f) f((void *) &twostrings);
make_beautiful_animation((void *) &twostrings);
}
/* end keyed functions */
@ -2247,6 +2237,7 @@ static void do_info_filemenu(void *arg, int event)
case 9:
write_videoscape_fs();
break;
/*
case 20:
strcpy(dir, G.sce);
activate_fileselect(FILE_SPECIAL, "INSTALL LICENSE KEY", dir, loadKeyboard);
@ -2254,6 +2245,7 @@ static void do_info_filemenu(void *arg, int event)
case 21:
SHOW_LICENSE_KEY();
break;
*/
case 22:
activate_fileselect(FILE_SPECIAL, "WRITE RUNTIME", "", write_runtime_check);
break;
@ -2307,9 +2299,10 @@ static uiBlock *info_file_optionsmenu(void *arg_unused)
/* flags are case-values */
uiDefBut(block, BUTM, 1, "Compress File", xco, yco-=20, 100, 19, NULL, 0.0, 0.0, 0, G_FILE_COMPRESS_BIT, "Use file compression");
/*
uiDefBut(block, BUTM, 1, "Sign File", xco, yco-=20, 100, 19, NULL, 0.0, 0.0, 0, G_FILE_SIGN_BIT, "Add signature to file");
uiDefBut(block, BUTM, 1, "Lock File", xco, yco-=20, 100, 19, NULL, 0.0, 0.0, 0, G_FILE_LOCK_BIT, "Protect the file from editing by others");
*/
/* Toggle buttons */
yco= 0;
@ -2318,9 +2311,10 @@ static uiBlock *info_file_optionsmenu(void *arg_unused)
uiBlockSetButmFunc(block, NULL, NULL);
/* flags are defines */
uiDefIconButI(block, ICONTOG|BIT|G_FILE_COMPRESS_BIT, 0, ICON_CHECKBOX_DEHLT, xco, yco-=20, 19, 19, &G.fileflags, 0.0, 0.0, 0, 0, "");
/*
uiDefIconButI(block, ICONTOG|BIT|G_FILE_SIGN_BIT, 0, ICON_CHECKBOX_DEHLT, xco, yco-=20, 19, 19, &G.fileflags, 0.0, 0.0, 0, 0, "");
uiDefIconButI(block, ICONTOG|BIT|G_FILE_LOCK_BIT, 0, ICON_CHECKBOX_DEHLT, xco, yco-=20, 19, 19, &G.fileflags, 0.0, 0.0, 0, 0, "");
*/
uiBlockSetDirection(block, UI_RIGHT);
return block;
@ -2410,17 +2404,15 @@ static uiBlock *info_filemenu(void *arg_unused)
uiDefBut(block, BUTM, 1, "Save As|F2", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 4, "Save to a new file");
uiDefBut(block, BUTM, 1, "Save|Ctrl W", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 5, "Save to the current file");
if (LICENSE_KEY_VALID && make_nice_software()) {
uiDefBlockBut(block, info_file_optionsmenu, NULL, "File options|>>", 0, xco-=20, 160, 19, "Click to open the File Options menu");
uiDefBlockBut(block, info_file_optionsmenu, NULL, "File options|>>", 0, xco-=20, 160, 19, "Click to open the File Options menu");
uiDefBut(block, SEPR, 0, "", 0, xco-=6, 160, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, SEPR, 0, "", 0, xco-=6, 160, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, BUTM, 1, "Save Runtime", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 22, "Create a runtime executable with the current project");
uiDefBut(block, BUTM, 1, "Save Runtime", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 22, "Create a runtime executable with the current project");
#ifdef _WIN32
uiDefBut(block, BUTM, 1, "Save dynamic Runtime", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 23, "Create a dynamic runtime executable with the current project (requieres extenal python20.dll)");
uiDefBut(block, BUTM, 1, "Save dynamic Runtime", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 23, "Create a dynamic runtime executable with the current project (requieres extenal python20.dll)");
#endif
uiDefBlockBut(block, info_runtime_optionsmenu, NULL, "Runtime options|>>", 0, xco-=20, 160, 19, "Click to open the File Options menu");
}
uiDefBlockBut(block, info_runtime_optionsmenu, NULL, "Runtime options|>>", 0, xco-=20, 160, 19, "Click to open the File Options menu");
uiDefBut(block, SEPR, 0, "", 0, xco-=6, 160, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefBut(block, BUTM, 1, "Save Image|F3", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 6, "Save the image in the render buffer to a file");
@ -2429,6 +2421,7 @@ static uiBlock *info_filemenu(void *arg_unused)
uiDefBut(block, BUTM, 1, "Save VideoScape|Alt W", 0, xco-=20, 160, 19, NULL, 0.0, 0.0, 1, 9, "Save the current scene to a file in VideoScape format");
/*
if (LICENSE_KEY_VALID) {
uiDefBut(block, SEPR, 0, "", 0, xco-=6, 160, 6, NULL, 0.0, 0.0, 1, 0, "");
uiDefBut(block, BUTM, 1, "Show License Key", 0, xco-=20, 140, 19, NULL, 0.0, 0.0, 1, 21, "Show the personal information stored in your Blender License Key");
@ -2438,6 +2431,7 @@ static uiBlock *info_filemenu(void *arg_unused)
uiDefBut(block, BUTM, 1, "Install License Key", 0, xco-=20, 140, 19, NULL, 0.0, 0.0, 1, 20, "Install your Blender License Key");
uiDefIconBut(block, BUTM, 1, ICON_PUBLISHER, 141,xco, 19, 19, NULL, 0.0, 0.0, 1, 20, "Install your Blender License Key");
}
*/
uiDefBut(block, SEPR, 0, "", 0, xco-=6, 160, 6, NULL, 0.0, 0.0, 1, 0, "");
@ -3202,11 +3196,9 @@ void info_buttons(void)
uiDefIconBut(block, BUT, B_SHOWSPLASH, ICON_BLENDER, xco+1, 0,XIC,YIC, 0, 0, 0, 0, 0, "");
uiBlockSetEmboss(block, UI_EMBOSSX);
if (LICENSE_KEY_VALID) {
uiBlockSetEmboss(block, UI_EMBOSSN);
uiDefIconBut(block, LABEL, 0, ICON_PUBLISHER, xco+125, 0,XIC,YIC, 0, 0, 0, 0, 0, "");
uiBlockSetEmboss(block, UI_EMBOSSX);
}
uiBlockSetEmboss(block, UI_EMBOSSN);
uiDefIconBut(block, LABEL, 0, ICON_PUBLISHER, xco+125, 0,XIC,YIC, 0, 0, 0, 0, 0, "");
uiBlockSetEmboss(block, UI_EMBOSSX);
/* altijd als laatste doen */
curarea->headbutlen= xco+2*XIC;

4
source/blender/src/pub/license_key.c
View File

@ -48,7 +48,7 @@
#include <config.h>
#endif
int LICENSE_KEY_VALID = FALSE;
int LICENSE_KEY_VALID = TRUE;
int I_AM_PUBLISHER = TRUE;
static UserStruct User;
@ -330,8 +330,6 @@ void checkhome()
// other initialization code
// enable png writing in the ImBuf library
IMB_fp_png_encode = IMB_png_encode;
}
}

7
source/blender/src/toets.c
View File

@ -98,7 +98,6 @@
#include "IMB_imbuf_types.h"
#include "mydevice.h"
#include "license_key.h"
#include "BIF_poseobject.h"
@ -189,7 +188,7 @@ void schrijfplaatje(char *name)
else printf("no zbuf\n");
}
}
else if((R.r.imtype==R_PNG) && (LICENSE_KEY_VALID)) {
else if(R.r.imtype==R_PNG) {
ibuf->ftype= PNG;
}
else if((R.r.imtype==R_TARGA) || (R.r.imtype==R_PNG)) {
@ -454,9 +453,7 @@ int save_image_filesel_str(char *str)
{
switch(G.scene->r.imtype) {
case R_PNG:
if (LICENSE_KEY_VALID) {
strcpy(str, "SAVE PNG"); return 1;
}
strcpy(str, "SAVE PNG"); return 1;
case R_TARGA:
strcpy(str, "SAVE TARGA"); return 1;
case R_RAWTGA:

9
source/blender/src/usiblender.c
View File

@ -109,7 +109,6 @@
#include "interface.h"
#include "radio.h"
#include "render.h"
#include "license_key.h"
#include "datatoc.h"
#include "SYS_System.h"
@ -138,11 +137,7 @@ void BIF_read_file(char *name)
info = BLO_getSignerInfo();
if (BLO_isValidSignerInfo(info)) {
sprintf(infostring, "File signed by: %s // %s", info->name, info->email);
if (LICENSE_KEY_VALID) {
splash((void *)datatoc_ton, datatoc_tonize, infostring);
} else {
splash((void *)datatoc_splash_jpg, datatoc_splash_jpg_size, infostring);
}
splash((void *)datatoc_ton, datatoc_tonize, infostring);
}
BLO_clrSignerInfo(info);
@ -451,7 +446,7 @@ void BIF_init(void)
init_draw_rects(); /* drawobject.c */
init_gl_stuff(); /* drawview.c */
if (I_AM_PUBLISHER) checkhome();
/* if (I_AM_PUBLISHER) checkhome(); */
BIF_read_homefile();

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

@ -36,7 +36,6 @@
#include "DNA_texture_types.h" // EnvMap{}
#include "DNA_image_types.h" // Image{}
#include "render.h"
#include "license_key.h" // LICENSE_KEY_VALID
#include "BKE_utildefines.h" // ELEM
#include "BIF_writeimage.h"
@ -51,7 +50,7 @@ int BIF_write_ibuf(ImBuf *ibuf, char *name)
/* to be used for e.g. envmap, not rendered images */
if(R.r.imtype== R_IRIS) ibuf->ftype= IMAGIC;
else if ((R.r.imtype==R_PNG) && (LICENSE_KEY_VALID)) {
else if ((R.r.imtype==R_PNG)) {
ibuf->ftype= PNG;
}
else if ((R.r.imtype==R_TARGA) || (R.r.imtype==R_PNG)) {

2
source/creator/creator.c
View File

@ -84,8 +84,6 @@
#include "render.h"
#include "nla.h"
#include "license_key.h"
/* for passing information between creator and gameengine */
#include "SYS_System.h"