Grease Pencil - Defaults Cleanups:
authorJoshua Leung <aligorith@gmail.com>
Mon, 8 Sep 2008 12:36:49 +0000 (12:36 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 8 Sep 2008 12:36:49 +0000 (12:36 +0000)
* 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.

source/blender/src/drawaction.c
source/blender/src/gpencil.c
source/blender/src/resources.c
source/blender/src/usiblender.c

index 0782ccfc7ee1ab0fdf000637c9519d6bc043deee..33eb5262c3dcf0f91f8f50e224e99d6710f44993 100644 (file)
@@ -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:
                                                {
index fa3ada89a3a1cade818ab9f0bb0c958cf96d1614..c7540bc4a1f25c11b99784c253f2e12dbc3a18f2 100644 (file)
@@ -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;
 }
index acd14aae7a58daacf758ccfd8a75b15af96d818f..1bef10d0415815cc22c85e2e462178f6779fce9c 100644 (file)
@@ -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);
index 901daf0ee582b1005ccb2ae5ac6675a16c2ee542..aa49065320b099ec11687f8effe2cbaa91131faa 100644 (file)
@@ -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);
                }
        }