[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15454] branches/blender-2.47: branches/ blender-2.47

Diego Borghetti bdiego at gmail.com
Sun Jul 6 17:34:40 CEST 2008


Revision: 15454
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15454
Author:   bdiego
Date:     2008-07-06 17:34:40 +0200 (Sun, 06 Jul 2008)

Log Message:
-----------
branches/blender-2.47

Merge from trunk:
	Revision: 15418
	Revision: 15433
	Revision: 15438
	Revision: 15447
	Revision: 15448
	Revision: 15450

Modified Paths:
--------------
    branches/blender-2.47/release/windows/installer/00.sconsblender.nsi
    branches/blender-2.47/source/blender/blenkernel/intern/image.c
    branches/blender-2.47/source/blender/blenlib/BLI_arithb.h
    branches/blender-2.47/source/blender/blenlib/BLI_winstuff.h
    branches/blender-2.47/source/blender/src/editseq.c
    branches/blender-2.47/source/blender/src/headerbuttons.c

Modified: branches/blender-2.47/release/windows/installer/00.sconsblender.nsi
===================================================================
--- branches/blender-2.47/release/windows/installer/00.sconsblender.nsi	2008-07-06 15:02:21 UTC (rev 15453)
+++ branches/blender-2.47/release/windows/installer/00.sconsblender.nsi	2008-07-06 15:34:40 UTC (rev 15454)
@@ -353,6 +353,7 @@
   SetOutPath $INSTDIR
   ; Write the installation path into the registry
   WriteRegStr HKLM SOFTWARE\BlenderFoundation "Install_Dir" "$INSTDIR"
+  WriteRegStr HKLM SOFTWARE\BlenderFoundation "Home_Dir" "$BLENDERHOME"
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "DisplayName" "Blender (remove only)"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender" "UninstallString" '"$INSTDIR\uninstall.exe"'
@@ -406,28 +407,32 @@
 UninstallText "This will uninstall Blender VERSION. Hit next to continue."
 
 Section "Uninstall"
+  Delete $INSTDIR\uninstall.exe
+  
+  ReadRegStr $BLENDERHOME HKLM "SOFTWARE\BlenderFoundation" "Home_Dir"
+  
   ; remove registry keys
   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Blender"
   DeleteRegKey HKLM SOFTWARE\BlenderFoundation
   ; remove files
   [DELROOTDIRCONTS]
   
-  Delete $INSTDIR\.blender\.bfont.ttf
-  Delete $INSTDIR\.blender\.Blanguages
+  Delete $BLENDERHOME\.blender\.bfont.ttf
+  Delete $BLENDERHOME\.blender\.Blanguages
   ; remove shortcuts, if any.
   Delete "$SMPROGRAMS\Blender Foundation\Blender\*.*"
   Delete "$DESKTOP\Blender.lnk"
   ; remove directories used.
-  RMDir /r $INSTDIR\.blender\locale
+  RMDir /r $BLENDERHOME\.blender\locale
   MessageBox MB_YESNO "Erase .blender\scripts folder? (ALL contents will be erased!)" IDNO Next
-  RMDir /r $INSTDIR\.blender\scripts
-  RMDir /r $INSTDIR\.blender\scripts\bpymodules
-  RMDir /r $INSTDIR\.blender\scripts\bpydata
-  RMDir /r $INSTDIR\.blender\scripts\bpydata\config
+  RMDir /r $BLENDERHOME\.blender\scripts
+  RMDir /r $BLENDERHOME\.blender\scripts\bpymodules
+  RMDir /r $BLENDERHOME\.blender\scripts\bpydata
+  RMDir /r $BLENDERHOME\.blender\scripts\bpydata\config
 Next:
-  RMDir /r $INSTDIR\plugins\include
-  RMDir /r $INSTDIR\plugins
-  RMDir $INSTDIR\.blender
+  RMDir /r $BLENDERHOME\plugins\include
+  RMDir /r $BLENDERHOME\plugins
+  RMDir $BLENDERHOME\.blender
   RMDir "$SMPROGRAMS\Blender Foundation\Blender"
   RMDir "$SMPROGRAMS\Blender Foundation"
   RMDir "$INSTDIR"

Modified: branches/blender-2.47/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/blender-2.47/source/blender/blenkernel/intern/image.c	2008-07-06 15:02:21 UTC (rev 15453)
+++ branches/blender-2.47/source/blender/blenkernel/intern/image.c	2008-07-06 15:34:40 UTC (rev 15454)
@@ -848,10 +848,6 @@
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
-	else if(ELEM5(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90)) {
-		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
-			extension= ".jpg";
-	}
 	else if(imtype==R_BMP) {
 		if(!BLI_testextensie(string, ".bmp"))
 			extension= ".bmp";
@@ -874,10 +870,14 @@
 		if (!BLI_testextensie(string, ".dpx"))
 			extension= ".dpx";
 	}
-	else {	/* targa default */
+	else if(imtype==R_TARGA) {
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
+	else { //   R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90, R_QUICKTIME etc
+		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
+			extension= ".jpg";
+	}
 
 	strcat(string, extension);
 }
@@ -1512,6 +1512,10 @@
 		image_initialize_after_load(ima, ibuf);
 		image_assign_ibuf(ima, ibuf, 0, frame);
 #endif
+		
+		if(ima->flag & IMA_DO_PREMUL)
+			converttopremul(ibuf);
+		
 	}
 	else
 		ima->ok= 0;

Modified: branches/blender-2.47/source/blender/blenlib/BLI_arithb.h
===================================================================
--- branches/blender-2.47/source/blender/blenlib/BLI_arithb.h	2008-07-06 15:02:21 UTC (rev 15453)
+++ branches/blender-2.47/source/blender/blenlib/BLI_arithb.h	2008-07-06 15:34:40 UTC (rev 15454)
@@ -50,6 +50,9 @@
 #ifndef M_SQRT1_2
 #define M_SQRT1_2	0.70710678118654752440
 #endif
+#ifndef M_1_PI
+#define M_1_PI		0.318309886183790671538
+#endif
 
 #ifdef WIN32
 	#ifndef FREE_WINDOWS

Modified: branches/blender-2.47/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- branches/blender-2.47/source/blender/blenlib/BLI_winstuff.h	2008-07-06 15:02:21 UTC (rev 15453)
+++ branches/blender-2.47/source/blender/blenlib/BLI_winstuff.h	2008-07-06 15:34:40 UTC (rev 15454)
@@ -73,6 +73,9 @@
 #ifndef M_SQRT1_2
 #define M_SQRT1_2	0.70710678118654752440
 #endif
+#ifndef M_1_PI
+#define M_1_PI		0.318309886183790671538
+#endif
 
 #define MAXPATHLEN MAX_PATH
 

Modified: branches/blender-2.47/source/blender/src/editseq.c
===================================================================
--- branches/blender-2.47/source/blender/src/editseq.c	2008-07-06 15:02:21 UTC (rev 15453)
+++ branches/blender-2.47/source/blender/src/editseq.c	2008-07-06 15:34:40 UTC (rev 15454)
@@ -2135,12 +2135,25 @@
 	Sequence *seq;
 	MetaStack *ms;
 	Editing *ed;
+	int nothingSelected = TRUE;
 
-	if(okee("Erase selected")==0) return;
-
 	ed= G.scene->ed;
 	if(ed==0) return;
 
+	seq=get_last_seq();
+	if (seq && seq->flag & SELECT) { /* avoid a loop since this is likely to be selected */
+		nothingSelected = FALSE;
+	} else {
+		for (seq = ed->seqbasep->first; seq; seq = seq->next) {
+			if (seq->flag & SELECT) {
+				nothingSelected = FALSE;
+				break;
+			}
+		}
+	}
+	
+	if(nothingSelected || okee("Erase selected")==0) return;
+
 	/* free imbufs of all dependent strips */
 	for(seq=ed->seqbasep->first; seq; seq=seq->next)
 		if(seq->flag & SELECT)

Modified: branches/blender-2.47/source/blender/src/headerbuttons.c
===================================================================
--- branches/blender-2.47/source/blender/src/headerbuttons.c	2008-07-06 15:02:21 UTC (rev 15453)
+++ branches/blender-2.47/source/blender/src/headerbuttons.c	2008-07-06 15:34:40 UTC (rev 15454)
@@ -1628,6 +1628,7 @@
 		allqueue(REDRAWOOPS, 1);
 		allqueue(REDRAWACTION, 1);
 		allqueue(REDRAWNLA, 1);
+		allqueue(REDRAWVIEW3D, 1);
 		/* name scene also in set PUPmenu */
 		allqueue(REDRAWBUTSALL, 0);
 		allqueue(REDRAWIMAGE, 0);





More information about the Bf-blender-cvs mailing list