diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-09-08 16:36:49 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-09-08 16:36:49 +0400 |
| commit | 2768ee67bd0d78b7af1ef78537257ccf7bba7491 (patch) | |
| tree | a5f92336197033dd4c92cc242beb179e772cae12 /source | |
| parent | e3172d8f4d2eb0a5388ddf923142b2d0d53af278 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/drawaction.c | 12 | ||||
| -rw-r--r-- | source/blender/src/gpencil.c | 7 | ||||
| -rw-r--r-- | source/blender/src/resources.c | 2 | ||||
| -rw-r--r-- | source/blender/src/usiblender.c | 9 |
4 files changed, 26 insertions, 4 deletions
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index 0782ccfc7ee..33eb5262c3d 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -682,6 +682,18 @@ static void draw_channel_names(void) 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: { diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c index fa3ada89a3a..c7540bc4a1f 100644 --- a/source/blender/src/gpencil.c +++ b/source/blender/src/gpencil.c @@ -224,8 +224,8 @@ bGPDlayer *gpencil_layer_addnew (bGPdata *gpd) 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 @@ bGPdata *gpencil_data_addnew (void) 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; } diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index acd14aae7a5..1bef10d0415 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -753,6 +753,8 @@ char *BIF_ThemeColorsPup(int spacetype) 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); diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 901daf0ee58..aa49065320b 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -484,11 +484,20 @@ static void init_userdef_file(void) 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); } } |