archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages 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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}