[Bf-blender-cvs] [8f34d5cdb3b] greasepencil-object: Cleanup - Change naming of Palette Slot vars to be easier to type

[Joshua Leung]

Commit: 8f34d5cdb3b9a6ac8c2b10dbfd8f36a9137dde40
Author: Joshua Leung
Date:   Mon Oct 2 15:36:42 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB8f34d5cdb3b9a6ac8c2b10dbfd8f36a9137dde40

Cleanup - Change naming of Palette Slot vars to be easier to type

===================================================================

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/blenloader/intern/readfile.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index d99e3a16670..07eaa9c4ec9 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -147,10 +147,10 @@ void BKE_gpencil_brush_setactive(struct ToolSettings *ts, struct bGPDbrush *acti
 void BKE_gpencil_brush_delete(struct ToolSettings *ts, struct bGPDbrush *brush);
 
 /* Palette Slots */
-void BKE_gpencil_palette_slot_free(struct bGPdata *gpd, struct bGPDpaletteref *gpref);
+void BKE_gpencil_palette_slot_free(struct bGPdata *gpd, struct bGPDpaletteref *palslot);
 
 struct bGPDpaletteref *BKE_gpencil_paletteslot_get_active(const struct bGPdata *gpd);
-void BKE_gpencil_paletteslot_set_active(struct bGPdata *gpd, const struct bGPDpaletteref *gpref);
+void BKE_gpencil_paletteslot_set_active(struct bGPdata *gpd, const struct bGPDpaletteref *palslot);
 void BKE_gpencil_paletteslot_set_active_palette(struct bGPdata *gpd, const struct Palette *palette);
 struct bGPDpaletteref *BKE_gpencil_paletteslot_find(struct bGPdata *gpd, const struct Palette *palette);
 
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 6fc10ed66a4..dbf08955ec2 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -242,33 +242,33 @@ void BKE_gpencil_free_layers(ListBase *list)
 /* Free palette slot
  * NOTE: This doesn't unlink the palette from any strokes that may be using it
  */
-void BKE_gpencil_palette_slot_free(bGPdata *gpd, bGPDpaletteref *gpref)
+void BKE_gpencil_palette_slot_free(bGPdata *gpd, bGPDpaletteref *palslot)
 {
-	if (ELEM(NULL, gpd, gpref))
+	if (ELEM(NULL, gpd, palslot))
 		return;
 	
 	/* unlink palette */
-	if (gpref->palette) {
-		id_us_min(&gpref->palette->id);
+	if (palslot->palette) {
+		id_us_min(&palslot->palette->id);
 	}
 	
 	/* free slot */
-	BLI_freelinkN(&gpd->palette_slots, gpref);
+	BLI_freelinkN(&gpd->palette_slots, palslot);
 }
 
 /* Free palette slots */
 static void BKE_gpencil_free_paletteslots(bGPdata *gpd)
 {
-	bGPDpaletteref *gpref, *gpr_next;
+	bGPDpaletteref *palslot, *gpr_next;
 	
 	/* error checking */
 	if (gpd == NULL) return;
 	
 	/* delete palette slots */
-	for (gpref = gpd->palette_slots.first; gpref; gpref = gpr_next) {
-		gpr_next = gpref->next;
+	for (palslot = gpd->palette_slots.first; palslot; palslot = gpr_next) {
+		gpr_next = palslot->next;
 		
-		BKE_gpencil_palette_slot_free(gpd, gpref);
+		BKE_gpencil_palette_slot_free(gpd, palslot);
 	}
 }
 
@@ -1423,36 +1423,36 @@ bGPDpaletteref *BKE_gpencil_paletteslot_get_active(const bGPdata *gpd)
 }
 
 /* Set active palette slot */
-void BKE_gpencil_paletteslot_set_active(bGPdata *gpd, const bGPDpaletteref *gpref)
+void BKE_gpencil_paletteslot_set_active(bGPdata *gpd, const bGPDpaletteref *palslot)
 {
 	/* sanity checks */
-	if (ELEM(NULL, gpd, gpref))
+	if (ELEM(NULL, gpd, palslot))
 		return;
 	
 	/* try to find index of this item, assuming it exists in the list */
-	gpd->active_palette_slot = BLI_findindex(&gpd->palette_slots, gpref);
+	gpd->active_palette_slot = BLI_findindex(&gpd->palette_slots, palslot);
 }
 
 /* Make the slot using this palette active */
 void BKE_gpencil_paletteslot_set_active_palette(bGPdata *gpd, const Palette *palette)
 {
-	bGPDpaletteref *gpref = BKE_gpencil_paletteslot_find(gpd, palette);
-	BKE_gpencil_paletteslot_set_active(gpd, gpref);
+	bGPDpaletteref *palslot = BKE_gpencil_paletteslot_find(gpd, palette);
+	BKE_gpencil_paletteslot_set_active(gpd, palslot);
 }
 
 /* Get palette slot that uses this Palette */
 bGPDpaletteref *BKE_gpencil_paletteslot_find(bGPdata *gpd, const Palette *palette)
 {
-	bGPDpaletteref *gpref;
+	bGPDpaletteref *palslot;
 	
 	/* sanity checks */
 	if (ELEM(NULL, gpd, palette))
 		return NULL;
 	
 	/* search for the palette */
-	for (gpref = gpd->palette_slots.first; gpref; gpref = gpref->next) {
-		if (gpref->palette == palette)
-			return gpref;
+	for (palslot = gpd->palette_slots.first; palslot; palslot = palslot->next) {
+		if (palslot->palette == palette)
+			return palslot;
 	}
 	
 	/* not found */
@@ -1462,7 +1462,7 @@ bGPDpaletteref *BKE_gpencil_paletteslot_find(bGPdata *gpd, const Palette *palett
 /* Create a new palette slot (and optionally assign a palette to it) */
 bGPDpaletteref *BKE_gpencil_paletteslot_addnew(bGPdata *gpd, Palette *palette)
 {
-	bGPDpaletteref *gpref;
+	bGPDpaletteref *palslot;
 	
 	/* sanity checks */
 	if (gpd == NULL) {
@@ -1470,25 +1470,25 @@ bGPDpaletteref *BKE_gpencil_paletteslot_addnew(bGPdata *gpd, Palette *palette)
 	}
 	if (palette) {
 		/* check if it's used already - don't allow for duplicates */
-		gpref = BKE_gpencil_paletteslot_find(gpd, palette);
-		if (gpref) {
+		palslot = BKE_gpencil_paletteslot_find(gpd, palette);
+		if (palslot) {
 			/* just return existing? */
-			return gpref;
+			return palslot;
 		}
 	}
 	
 	/* allocate a new slot, and assigned palette as user */
-	gpref = MEM_callocN(sizeof(bGPDpaletteref), "bGPDpaletteref");
-	BLI_addtail(&gpd->palette_slots, gpref);
+	palslot = MEM_callocN(sizeof(bGPDpaletteref), "bGPDpaletteref");
+	BLI_addtail(&gpd->palette_slots, palslot);
 	
 	/* assign palette */
 	if (palette) {
-		gpref->palette = palette;
+		palslot->palette = palette;
 		id_us_plus(&palette->id);
 	}
 	
 	/* return new slot */
-	return gpref;
+	return palslot;
 }
 
 /* ************************************************** */
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ada87b0aeb0..0630e384daa 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6571,8 +6571,8 @@ static void lib_link_gpencil(FileData *fd, Main *main)
 			}
 			
 			/* Palette Slots */
-			for (bGPDpaletteref *gpref = gpd->palette_slots.first; gpref; gpref = gpref->next) {
-				gpref->palette = newlibadr_us(fd, gpd->id.lib, gpref->palette);
+			for (bGPDpaletteref *palslot = gpd->palette_slots.first; palslot; palslot = palslot->next) {
+				palslot->palette = newlibadr_us(fd, gpd->id.lib, palslot->palette);
 			}
 
 			IDP_LibLinkProperty(gpd->id.properties, fd);
@@ -10117,8 +10117,8 @@ static void expand_gpencil(FileData *fd, Main *mainvar, bGPdata *gpd)
 		}
 	}
 	
-	for (bGPDpaletteref *gpref = gpd->palette_slots.first; gpref; gpref = gpref->next) {
-		expand_doit(fd, mainvar, gpref->palette);
+	for (bGPDpaletteref *palslot = gpd->palette_slots.first; palslot; palslot = palslot->next) {
+		expand_doit(fd, mainvar, palslot->palette);
 	}
 }