[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28431] trunk/blender/source/blender/ editors/gpencil/gpencil_buttons.c: Proper fix for the Grease Pencil drawing options

[Joshua Leung]

Revision: 28431
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28431
Author:   aligorith
Date:     2010-04-26 12:02:30 +0200 (Mon, 26 Apr 2010)

Log Message:
-----------
Proper fix for the Grease Pencil drawing options

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c	2010-04-26 09:33:59 UTC (rev 28430)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c	2010-04-26 10:02:30 UTC (rev 28431)
@@ -221,13 +221,20 @@
 	}
 } 
 
+/* stroke drawing options available */
+typedef enum eGP_Stroke_Ops {
+	STROKE_OPTS_NORMAL = 0, 
+	STROKE_OPTS_V3D_OFF, 
+	STROKE_OPTS_V3D_ON,
+} eGP_Stroke_Ops;
+
 /* Draw the contents for a grease-pencil panel*/
 static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, PointerRNA *ctx_ptr)
 {
 	PointerRNA gpd_ptr;
 	bGPDlayer *gpl;
 	uiLayout *col, *row;
-	short v3d_stroke_opts_on = 0;
+	short v3d_stroke_opts = STROKE_OPTS_NORMAL;
 	
 	/* make new PointerRNA for Grease Pencil block */
 	RNA_id_pointer_create((ID *)gpd, &gpd_ptr);
@@ -259,7 +266,9 @@
 		/* check whether advanced 3D-View drawing space options can be used */
 		if (CTX_wm_view3d(C)) {
 			if (gpd->flag & (GP_DATA_DEPTH_STROKE|GP_DATA_DEPTH_VIEW))
-				v3d_stroke_opts_on = 1;
+				v3d_stroke_opts = STROKE_OPTS_V3D_ON;
+			else
+				v3d_stroke_opts = STROKE_OPTS_V3D_OFF;
 		}
 		
 		/* drawing space options */
@@ -267,11 +276,12 @@
 			uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, 0);
 			uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL, 0);
 		row= uiLayoutRow(col, 1);
+			uiLayoutSetActive(row, v3d_stroke_opts);
 			uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, 0);
 			uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, 0);
 		
 		row= uiLayoutRow(col, 0);
-			uiLayoutSetActive(row, v3d_stroke_opts_on);
+			uiLayoutSetActive(row, v3d_stroke_opts==STROKE_OPTS_V3D_ON);
 			uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, 0);
 }