[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50078] trunk/blender/source/blender/ blenkernel: code cleanup: minor changes to last commit.

[Campbell Barton]

Revision: 50078
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50078
Author:   campbellbarton
Date:     2012-08-21 10:44:10 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
code cleanup: minor changes to last commit.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_packedFile.h
    trunk/blender/source/blender/blenkernel/intern/font.c
    trunk/blender/source/blender/blenkernel/intern/packedFile.c

Modified: trunk/blender/source/blender/blenkernel/BKE_packedFile.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_packedFile.h	2012-08-21 10:44:04 UTC (rev 50077)
+++ trunk/blender/source/blender/blenkernel/BKE_packedFile.h	2012-08-21 10:44:10 UTC (rev 50078)
@@ -43,7 +43,7 @@
 struct VFont;
 
 /* pack */
-struct PackedFile *dupPackedFileMemory(const struct PackedFile *pf_src);
+struct PackedFile *dupPackedFile(const struct PackedFile *pf_src);
 struct PackedFile *newPackedFile(struct ReportList *reports, const char *filename, const char *relabase);
 struct PackedFile *newPackedFileMemory(void *mem, int memlen);
 

Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c	2012-08-21 10:44:04 UTC (rev 50077)
+++ trunk/blender/source/blender/blenkernel/intern/font.c	2012-08-21 10:44:10 UTC (rev 50078)
@@ -60,7 +60,6 @@
 #include "BKE_curve.h"
 #include "BKE_displist.h"
 
-//static ListBase ttfdata = {NULL, NULL};
 
 /* The vfont code */
 void BKE_vfont_free_data(struct VFont *vfont)
@@ -149,7 +148,7 @@
 
 				/* We need to copy a tmp font to memory unless it is already there */
 				if (vfont->temp_pf == NULL) {
-					vfont->temp_pf = dupPackedFileMemory(pf);
+					vfont->temp_pf = dupPackedFile(pf);
 				}
 			}
 			else {
@@ -237,8 +236,6 @@
 		if (!vfont || vfont->packedfile != pf) {
 			freePackedFile(pf);
 		}
-	
-		//XXX waitcursor(0);
 	}
 	
 	return vfont;
@@ -248,13 +245,13 @@
 {
 	switch (info->flag & (CU_CHINFO_BOLD | CU_CHINFO_ITALIC)) {
 		case CU_CHINFO_BOLD:
-			if (cu->vfontb) return(cu->vfontb); else return(cu->vfont);
+			return cu->vfontb ? cu->vfontb : cu->vfont;
 		case CU_CHINFO_ITALIC:
-			if (cu->vfonti) return(cu->vfonti); else return(cu->vfont);
+			return cu->vfonti ? cu->vfonti : cu->vfont;
 		case (CU_CHINFO_BOLD | CU_CHINFO_ITALIC):
-			if (cu->vfontbi) return(cu->vfontbi); else return(cu->vfont);
+			return cu->vfontbi ? cu->vfontbi : cu->vfont;
 		default:
-			return(cu->vfont);
+			return cu->vfont;
 	}
 }
 

Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c	2012-08-21 10:44:04 UTC (rev 50077)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c	2012-08-21 10:44:10 UTC (rev 50078)
@@ -159,7 +159,7 @@
 		printf("freePackedFile: Trying to free a NULL pointer\n");
 }
 
-PackedFile *dupPackedFileMemory(const PackedFile *pf_src)
+PackedFile *dupPackedFile(const PackedFile *pf_src)
 {
 	PackedFile *pf_dst;