[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16422] trunk/blender/source/blender/src: Grease Pencil - Defaults Cleanups:

[Joshua Leung]

Revision: 16422
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16422
Author:   aligorith
Date:     2008-09-08 14:36:49 +0200 (Mon, 08 Sep 2008)

Log Message:
-----------
Grease Pencil - Defaults Cleanups:

* Made new layers default to having thickness of 3, and opacity of 0.9. These values seem to be used more often.
* Newly added Grease Pencil blocks will now be expanded by default in the Action Editor
* Added support for Image Editor grease-pencil blocks to the Action Editor
* Added version-patching for missing colours used by the info-string for GPencil.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawaction.c
    trunk/blender/source/blender/src/gpencil.c
    trunk/blender/source/blender/src/resources.c
    trunk/blender/source/blender/src/usiblender.c

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2008-09-08 12:06:40 UTC (rev 16421)
+++ trunk/blender/source/blender/src/drawaction.c	2008-09-08 12:36:49 UTC (rev 16422)
@@ -682,6 +682,18 @@
 							special= ICON_SEQUENCE;
 						}
 							break;
+						case SPACE_IMAGE:
+						{
+							SpaceImage *sima= sa->spacedata.first;
+							
+							if (sima->image)
+								sprintf(name, "Image: %s", sima->image->id.name+2);
+							else
+								sprintf(name, "Image: <None>");
+								
+							special= ICON_IMAGE_COL;
+						}
+							break;
 						
 						default:
 						{

Modified: trunk/blender/source/blender/src/gpencil.c
===================================================================
--- trunk/blender/source/blender/src/gpencil.c	2008-09-08 12:06:40 UTC (rev 16421)
+++ trunk/blender/source/blender/src/gpencil.c	2008-09-08 12:36:49 UTC (rev 16422)
@@ -224,8 +224,8 @@
 	BLI_addtail(&gpd->layers, gpl);
 	
 	/* set basic settings */
-	gpl->color[3]= 1.0f;
-	gpl->thickness = 1;
+	gpl->color[3]= 0.9f;
+	gpl->thickness = 3;
 	
 	/* auto-name */
 	sprintf(gpl->info, "GP_Layer");
@@ -247,8 +247,7 @@
 	gpd= MEM_callocN(sizeof(bGPdata), "GreasePencilData");
 	
 	/* initial settings */
-		/* it is quite useful to be able to see this info, so on by default */
-	gpd->flag = GP_DATA_DISPINFO;
+	gpd->flag = (GP_DATA_DISPINFO|GP_DATA_EXPAND);
 	
 	return gpd;
 }

Modified: trunk/blender/source/blender/src/resources.c
===================================================================
--- trunk/blender/source/blender/src/resources.c	2008-09-08 12:06:40 UTC (rev 16421)
+++ trunk/blender/source/blender/src/resources.c	2008-09-08 12:36:49 UTC (rev 16422)
@@ -753,6 +753,8 @@
 			str += sprintf(str, "Transition Strip %%x%d|", TH_SEQ_TRANSITION);
 			str += sprintf(str, "Meta Strip %%x%d|", TH_SEQ_META);
 			str += sprintf(str, "Current Frame %%x%d", TH_CFRAME);
+			str += sprintf(str, "Keyframe %%x%d|", TH_VERTEX_SELECT);
+			str += sprintf(str, "Draw Action %%x%d|", TH_BONE_POSE);
 			break;
 		case SPACE_SOUND:
 			str += sprintf(str, "Grid %%x%d|", TH_GRID);

Modified: trunk/blender/source/blender/src/usiblender.c
===================================================================
--- trunk/blender/source/blender/src/usiblender.c	2008-09-08 12:06:40 UTC (rev 16421)
+++ trunk/blender/source/blender/src/usiblender.c	2008-09-08 12:36:49 UTC (rev 16422)
@@ -484,11 +484,20 @@
 		bTheme *btheme;
 		for(btheme= U.themes.first; btheme; btheme= btheme->next) {
 			char *col;
+			
+			/* IPO Editor: Handles/Vertices */
 			col = btheme->tipo.vertex;
 			SETCOL(btheme->tipo.handle_vertex, col[0], col[1], col[2], 255);
 			col = btheme->tipo.vertex_select;
 			SETCOL(btheme->tipo.handle_vertex_select, col[0], col[1], col[2], 255);
 			btheme->tipo.handle_vertex_size= btheme->tipo.vertex_size;
+			
+			/* Sequence/Image Editor: colors for GPencil text */
+			col = btheme->tv3d.bone_pose;
+			SETCOL(btheme->tseq.bone_pose, col[0], col[1], col[2], 255);
+			SETCOL(btheme->tima.bone_pose, col[0], col[1], col[2], 255);
+			col = btheme->tv3d.vertex_select;
+			SETCOL(btheme->tseq.vertex_select, col[0], col[1], col[2], 255);
 		}
 	}