[Bf-blender-cvs] [0221a11] master: Project Paint: save 8 bytes per pixel (re-align)

Campbell Barton noreply at git.blender.org
Sat Apr 25 04:55:25 CEST 2015


Commit: 0221a11c9516083eae22fe51bb63be532e47641f
Author: Campbell Barton
Date:   Sat Apr 25 12:52:51 2015 +1000
Branches: master
https://developer.blender.org/rB0221a11c9516083eae22fe51bb63be532e47641f

Project Paint: save 8 bytes per pixel (re-align)

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

M	source/blender/editors/sculpt_paint/paint_image_proj.c

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

diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index fcbe613..d75b3f8 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -332,25 +332,27 @@ typedef union pixelStore {
 typedef struct ProjPixel {
 	float projCoSS[2]; /* the floating point screen projection of this pixel */
 	float worldCoSS[3];
+
+	short x_px, y_px;
+
+	unsigned short image_index; /* if anyone wants to paint onto more than 65535 images they can bite me */
+	unsigned char bb_cell_index;
+
+	/* for various reasons we may want to mask out painting onto this pixel */
+	unsigned short mask;
+
 	/* Only used when the airbrush is disabled.
 	 * Store the max mask value to avoid painting over an area with a lower opacity
 	 * with an advantage that we can avoid touching the pixel at all, if the
 	 * new mask value is lower then mask_accum */
 	unsigned short *mask_accum;
 
-	/* for various reasons we may want to mask out painting onto this pixel */
-	unsigned short mask;
-
-	short x_px, y_px;
 	/* horrible hack, store tile valid flag pointer here to re-validate tiles used for anchored and drag-dot strokes */
 	bool *valid;
 
 	PixelPointer origColor;
 	PixelStore newColor;
 	PixelPointer pixel;
-
-	short image_index; /* if anyone wants to paint onto more than 32768 images they can bite me */
-	unsigned char bb_cell_index;
 } ProjPixel;
 
 typedef struct ProjPixelClone {




More information about the Bf-blender-cvs mailing list