sgefants patch to remove the License Key stuff.

(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

intern/SoundSystem/intern/SND_Utils.cpp

@@ -58,9 +58,6 @@ extern "C" {
 #include <unistd.h>
 #endif
 
-//extern int LICENSE_KEY_VALID;
-#define LICENSE_KEY_VALID true
-
 #define BUFFERSIZE 32
 
 
@@ -171,9 +168,6 @@ 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)
 			{
 				case SND_WAVE_FORMAT_ADPCM:
@@ -190,17 +184,16 @@ 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, "<EFBFBD><EFBFBD>", 2))) && LICENSE_KEY_VALID)
+		else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "<EFBFBD><EFBFBD>", 2))))
 		{
 			result = true;
 		}

source/blender/blenloader/intern/writefile.c

@@ -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) {

source/blender/imbuf/IMB_imbuf.h

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

source/blender/imbuf/intern/writeimage.c

@@ -58,8 +58,6 @@
 #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;
@@ -81,8 +79,8 @@ short IMB_saveiff(struct ImBuf *ibuf,char *naam,int flags)
 		}
 	}
 
-	if (IS_png(ibuf) && IMB_fp_png_encode) {
+	if (IS_png(ibuf)) {
-		ok = IMB_fp_png_encode(ibuf,file,flags);
+		ok = IMB_png_encode(ibuf,file,flags);
 		if (ok) {
 			close (file);
 			return (ok);

source/blender/src/buttons.c

@@ -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,7 +6267,6 @@ 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
 
 #ifdef _WIN32
@@ -6293,20 +6289,6 @@ static char *imagetype_pup(void)
 		"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
-		);
-	}
 
 	return (string);
 }

source/blender/src/cre/license_key.c

@@ -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)

source/blender/src/editnla.c

@@ -81,8 +81,6 @@
 #include "blendef.h"
 #include "mydevice.h"
 #include "blendertimer.h"
-#include "license_key.h"
-#include "keyed_functions.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -136,7 +134,6 @@ int calc_memleak (void* ptr){
 	event = params->event;
 	val = params->val;
 	
-	if (LICENSE_KEY_VALID){
 	if(curarea->win==0) return 0;
 	
 	if (!snla)
@@ -236,7 +233,6 @@ int calc_memleak (void* ptr){
 	}
 	
 	if(doredraw) scrarea_queue_winredraw(curarea);
-	}	
 	return 0;
 }
 
@@ -255,62 +251,7 @@ void winqreadnlaspace(unsigned short event, short val, char ascii)
 
 
 	/* Call the protected (&obfuscated) eventloop function */
-	if (KEY_NLA_EVENT){
+	calc_memleak(&param); /* enable NLA */
-		KEY_NLA_EVENT(&param);
-	}
-	else{
-		getmouseco_areawin(mval);
-		switch(event) {
-		case GKEY:
-		case SKEY:
-		case AKEY:
-		case CKEY:
-		case NKEY:
-		case RIGHTMOUSE:
-			notice ("NLA window editing only available in Blender Publisher");
-			break;
-		case LEFTMOUSE:
-			if (mval[0]>NLAWIDTH){
-				do {
-					getmouseco_areawin(mval);
-					
-					areamouseco_to_ipoco(G.v2d, mval, &dx, &dy);
-					
-					cfra= (int)dx;
-					if(cfra< 1) cfra= 1;
-					
-					if( cfra!=CFRA ) {
-						CFRA= cfra;
-						update_for_newframe();
-						force_draw_plus(SPACE_VIEW3D);
-						force_draw_plus(SPACE_IPO);
-					}
-					
-				} while(get_mbut()&L_MOUSE);
-			}
-			
-			break;
-		case MIDDLEMOUSE:
-			view2dmove();	/* in drawipo.c */
-			break;
-		case DELKEY:
-		case XKEY:
-			if (okee ("This will remove all NLA information from all objects!")){
-				for (base = G.scene->base.first; base; base=base->next){
-					for (strip=base->object->nlastrips.first; strip; strip=next){
-						next=strip->next;
-						free_actionstrip(strip);
-						BLI_freelinkN(&base->object->nlastrips, strip);
-					}
-				}
-				update_for_newframe();
-			}
-			break;
-			
-		default:
-			break;
-		}
-	}
 }
 
 static void convert_nla(short mval[2])
@@ -321,7 +262,6 @@ static void convert_nla(short mval[2])
 	float x,y;
 	int sel=0;
 	bActionStrip *strip, *nstrip;
-	if (LICENSE_KEY_VALID){
 	/* Find out what strip we're over */
 	ymax = count_nla_levels() * (NLACHANNELSKIP+NLACHANNELHEIGHT);
 	areamouseco_to_ipoco(G.v2d, mval, &x, &y);
@@ -392,7 +332,6 @@ static void convert_nla(short mval[2])
 			break;
 		}
 	}
-	}
 }
 
 static void add_nlablock(short mval[2])
@@ -409,7 +348,6 @@ static void add_nlablock(short mval[2])
 	short nr;
 	int		cur;
 	
-	if (LICENSE_KEY_VALID){
 	areamouseco_to_ipoco(G.v2d, mval, &x, &y);
 	
 	mval[0]-=7;
@@ -491,7 +429,6 @@ static void add_nlablock(short mval[2])
 	act->id.us++;
 	
 	BLI_addtail(&base->object->nlastrips, strip);
-	}
 }
 
 static void mouse_nlachannels(short mval[2])
@@ -665,7 +602,6 @@ static void deselect_nlachannel_keys (int test)
 	bConstraintChannel *conchan;
 	
 	/* Determine if this is selection or deselection */
-	if (LICENSE_KEY_VALID){
 	if (test){
 		for (base=G.scene->base.first; base && sel; base=base->next){
 			
@@ -755,7 +691,6 @@ static void deselect_nlachannel_keys (int test)
 			}
 		}
 	}
-	}
 }
 
 
@@ -779,7 +714,6 @@ static void transform_nlachannel_keys(char mode)
 	bActionStrip *strip;
 	bConstraintChannel *conchan;
 
-	if (LICENSE_KEY_VALID){
 	/* Ensure that partial selections result in beztriple selections */
 	for (base=G.scene->base.first; base; base=base->next){
 
@@ -994,7 +928,6 @@ static void transform_nlachannel_keys(char mode)
 	allqueue (REDRAWNLA, 0);
 	allqueue (REDRAWIPO, 0);
 	MEM_freeN (tv);
-	}
 }
 
 static void delete_nlachannel_keys(void)
@@ -1004,7 +937,6 @@ static void delete_nlachannel_keys(void)
 	bConstraintChannel *conchan;
 	bActionStrip *strip, *nextstrip;
 	
-	if (LICENSE_KEY_VALID){
 	if (!okee("Erase selected keys"))
 		return;
 	
@@ -1043,7 +975,6 @@ static void delete_nlachannel_keys(void)
 	allspace(REMAKEALLIPO, 0);
 	allqueue(REDRAWNLA, 0);
 	allqueue(REDRAWIPO, 0);
-	}
 }
 
 static void duplicate_nlachannel_keys(void)
@@ -1052,7 +983,6 @@ static void duplicate_nlachannel_keys(void)
 	bActionChannel *chan;
 	bConstraintChannel *conchan;
 	bActionStrip *strip, *laststrip;
-	if (LICENSE_KEY_VALID){
 	
 	/* Find selected items */
 	for (base = G.scene->base.first; base; base=base->next){
@@ -1095,7 +1025,6 @@ static void duplicate_nlachannel_keys(void)
 	}
 	
 	transform_nlachannel_keys ('g');
-	}
 }
 
 static void borderselect_nla(void)
@@ -1109,7 +1038,6 @@ static void borderselect_nla(void)
 	bActionStrip *strip;
 	bConstraintChannel *conchan;
 	
-	if (LICENSE_KEY_VALID){
 	val= get_border (&rect, 3);
 	
 	if (val){
@@ -1183,7 +1111,6 @@ static void borderselect_nla(void)
 		allqueue(REDRAWACTION, 0);
 		allqueue(REDRAWIPO, 0);
 	}
-	}
 }
 
 static void mouse_nla(void)
@@ -1197,7 +1124,6 @@ static void mouse_nla(void)
 	bActionStrip *rstrip;
 	bConstraintChannel *conchan;
 	
-	if (LICENSE_KEY_VALID){
 	getmouseco_areawin (mval);
 	
 	/* Try object ipo selection */
@@ -1262,8 +1188,6 @@ static void mouse_nla(void)
 		
 	}
 	
-	}
-	
 }
 
 static Base *get_nearest_nlastrip (bActionStrip **rstrip, short *sel)
@@ -1277,7 +1201,6 @@ static Base *get_nearest_nlastrip (bActionStrip **rstrip, short *sel)
 	float ymin, ymax;
 	bActionStrip *strip, *firststrip, *foundstrip;
 	
-	if (LICENSE_KEY_VALID){
 	getmouseco_areawin (mval);
 	
 	mval[0]-=7;
@@ -1332,9 +1255,6 @@ static Base *get_nearest_nlastrip (bActionStrip **rstrip, short *sel)
 	}
 	*rstrip=firststrip;
 	return firstbase;
-	}
-	else
-		return NULL;
 }
 
 static Base *get_nearest_nlachannel_ob_key (float *index, short *sel)
@@ -1350,7 +1270,6 @@ static Base *get_nearest_nlachannel_ob_key (float *index, short *sel)
 	float ymin, ymax;
 	rctf	rectf;
 	
-	if (LICENSE_KEY_VALID){
 	*index=0;
 	
 	getmouseco_areawin (mval);
@@ -1445,9 +1364,6 @@ static Base *get_nearest_nlachannel_ob_key (float *index, short *sel)
 	
 	*index=firstvert;
 	return firstbase;
-	}
-	else
-		return NULL;
 }
 
 static bAction *get_nearest_nlachannel_ac_key (float *index, short *sel)
@@ -1464,7 +1380,6 @@ static bAction *get_nearest_nlachannel_ac_key (float *index, short *sel)
 	bActionChannel *chan;
 	bConstraintChannel *conchan;
 	
-	if (LICENSE_KEY_VALID){
 	*index=0;
 	
 	getmouseco_areawin (mval);
@@ -1563,9 +1478,6 @@ static bAction *get_nearest_nlachannel_ac_key (float *index, short *sel)
 	
 	*index=firstvert;
 	return firstact;
-	}
-	else
-		return NULL;
 }
 
 static bActionStrip *get_active_nlastrip(void)
@@ -1574,7 +1486,6 @@ static bActionStrip *get_active_nlastrip(void)
 	Base *base;
 	bActionStrip *strip;
 	
-	if (LICENSE_KEY_VALID){
 	for (base=G.scene->base.first; base; base=base->next){
 		if (nla_filter(base, 0) && base->object->type==OB_ARMATURE){
 			for (strip=base->object->nlastrips.first; strip; strip=strip->next){
@@ -1584,16 +1495,12 @@ static bActionStrip *get_active_nlastrip(void)
 		}
 	}
 	
-		return NULL;
-	}
-	else
 	return NULL;
 }
 
 void clever_numbuts_nla(void){
 	bActionStrip *strip;
 	int but=0;
-	if (LICENSE_KEY_VALID){
 		
 	/* Determine if an nla strip has been selected */
 	strip = get_active_nlastrip();
@@ -1652,7 +1559,6 @@ void clever_numbuts_nla(void){
 	update_for_newframe();
 	allqueue (REDRAWNLA, 0);
 	allqueue (REDRAWVIEW3D, 0);
-	}
 }	
 
 static void deselect_nlachannels(int test){

source/blender/src/editobject.c

@@ -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 the active object is a mesh...
-			if(me && LICENSE_KEY_VALID) {
+			if (me) {
 				// Bring up a little menu with the boolean operation choices on.
 				nr= pupmenu("Boolean %t|Intersect%x1|Union%x2|Difference%x3");
 

source/blender/src/editsca.c

@@ -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,8 +691,6 @@ static char *actuator_name(int type)
 
 static char *actuator_pup(Object *owner)
 {
-	if (LICENSE_KEY_VALID)
-	{
 	switch (owner->type)
 	{
 	case OB_ARMATURE:
@@ -710,23 +705,6 @@ static char *actuator_pup(Object *owner)
 			"|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";
-		}
-	}
-	
 }
 
 

source/blender/src/editscreen.c

@@ -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,
+					       datatoc_tonize, NULL);
-						       NULL);
-					} else {
-						splash((void *)datatoc_splash_jpg,
-						       datatoc_splash_jpg_size,
-						       NULL);
-					}
 				}
 			}
 			firsttime = 0;

source/blender/src/editsound.c

@@ -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,8 +467,6 @@ 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)
 			{
 			case SND_WAVE_FORMAT_ADPCM:
@@ -494,14 +488,11 @@ int sound_get_filetype_from_header(bSound* sound, PackedFile* pf)
 #ifdef USE_FMOD
 		}
 	}
-	}
+	else if (!memcmp(buffer, "OggS", 4))
-	/* only valid publishers may use ogg vorbis */
-	else if (!memcmp(buffer, "OggS", 4) && LICENSE_KEY_VALID)
 	{
 		filetype = SAMPLE_OGG_VORBIS;
 	}
-	/* only valid publishers may use mp3 */
+	else if ((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "<EFBFBD><EFBFBD>", 2)))
-	else if (((!memcmp(buffer, "ID3", 3)) || (!memcmp(buffer, "<EFBFBD><EFBFBD>", 2))) && LICENSE_KEY_VALID)
 	{
 		filetype = SAMPLE_MP3;
 	}

source/blender/src/headerbuttons.c

@@ -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();
-		}
 		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,7 +2404,6 @@ 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");
 
 	uiDefBut(block, SEPR, 0, "",						0, xco-=6, 160, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -2420,7 +2413,6 @@ static uiBlock *info_filemenu(void *arg_unused)
 	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");
-	}
 
 	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);
-	}
 
 	/* altijd als laatste doen */
 	curarea->headbutlen= xco+2*XIC;

source/blender/src/pub/license_key.c

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

source/blender/src/toets.c

@@ -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;
-		}
 	case R_TARGA:
 		strcpy(str, "SAVE TARGA"); return 1;
 	case R_RAWTGA:

source/blender/src/usiblender.c

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

source/blender/src/writeimage.c

@@ -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)) {

source/creator/creator.c

@@ -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"