[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49197] trunk/blender/source/blender: code cleanup: comment deprecated defines

[Campbell Barton]

Revision: 49197
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49197
Author:   campbellbarton
Date:     2012-07-25 10:55:45 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
code cleanup: comment deprecated defines

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/space_image.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c	2012-07-25 10:46:19 UTC (rev 49196)
+++ trunk/blender/source/blender/editors/space_image/space_image.c	2012-07-25 10:55:45 UTC (rev 49197)
@@ -146,10 +146,10 @@
 	
 	simage = MEM_callocN(sizeof(SpaceImage), "initimage");
 	simage->spacetype = SPACE_IMAGE;
-	simage->zoom = 1;
-	simage->lock = 1;
+	simage->zoom = 1.0f;
+	simage->lock = TRUE;
 
-	simage->iuser.ok = 1;
+	simage->iuser.ok = TRUE;
 	simage->iuser.fie_ima = 2;
 	simage->iuser.frames = 100;
 	

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2012-07-25 10:46:19 UTC (rev 49196)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2012-07-25 10:55:45 UTC (rev 49197)
@@ -678,7 +678,7 @@
 
 	struct Image *image;
 	struct ImageUser iuser;
-	struct CurveMapping *cumap;		
+	struct CurveMapping *cumap;
 	
 	struct Scopes scopes;           /* histogram waveform and vectorscope */
 	struct Histogram sample_line_hist;  /* sample line histogram */
@@ -690,10 +690,11 @@
 	float zoom;                     /* user defined zoom level */
 	float centx, centy;             /* storage for offset while render drawing */
 
+	char  mode;                     /* view/paint/mask */
+	char  pin;
+	short pad;
 	short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */
-	short pad;
 	short lock;
-	short pin;
 	char dt_uv; /* UV draw type */
 	char sticky; /* sticky selection type */
 	char dt_uvstretch;
@@ -728,15 +729,15 @@
 
 /* SpaceImage->flag */
 typedef enum eSpaceImage_Flag {
-	SI_BE_SQUARE          = (1 << 0),
-	SI_EDITTILE           = (1 << 1),
+/*	SI_BE_SQUARE          = (1 << 0), */  /* deprecated */
+	SI_EDITTILE           = (1 << 1),     /* XXX - not used but should be? */
 	SI_CLIP_UV            = (1 << 2),
 	SI_DRAWTOOL           = (1 << 3),
 	SI_NO_DRAWFACES       = (1 << 4),
 	SI_DRAWSHADOW         = (1 << 5),
-/*  SI_SELACTFACE         = (1 << 6), */ /* deprecated */
-	SI_DEPRECATED2        = (1 << 7),
-	SI_DEPRECATED3        = (1 << 8),   /* stick UV selection to mesh vertex (UVs wont always be touching) */
+/*	SI_SELACTFACE         = (1 << 6), */  /* deprecated */
+/*	SI_DEPRECATED2        = (1 << 7), */  /* deprecated */
+/*	SI_DEPRECATED3        = (1 << 8), */  /* deprecated */
 	SI_COORDFLOATS        = (1 << 9),
 	SI_PIXELSNAP          = (1 << 10),
 	SI_LIVE_UNWRAP        = (1 << 11),
@@ -748,8 +749,8 @@
 	SI_PREVSPACE          = (1 << 15),
 	SI_FULLWINDOW         = (1 << 16),
 	
-	SI_DEPRECATED4        = (1 << 17),
-	SI_DEPRECATED5        = (1 << 18),
+/*	SI_DEPRECATED4        = (1 << 17), */  /* deprecated */
+/*	SI_DEPRECATED5        = (1 << 18), */  /* deprecated */
 	
 	/* this means that the image is drawn until it reaches the view edge,
 	 * in the image view, its unrelated to the 'tile' mode for texface
@@ -757,7 +758,7 @@
 	SI_DRAW_TILE          = (1 << 19),
 	SI_SMOOTH_UV          = (1 << 20),
 	SI_DRAW_STRETCH       = (1 << 21),
-/*  SI_DISPGP             = (1 << 22), */ /* DEPRECATED */
+/*  SI_DISPGP             = (1 << 22), */  /* deprecated */
 	SI_DRAW_OTHER         = (1 << 23),
 
 	SI_COLOR_CORRECTION   = (1 << 24),