archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

== Grease Pencil - UI Improvements ==

Browse Source 
Based on user feedback, I've made some changes to the Grease Pencil UI (most notably in 'Time Editing' facilities). 
* 'Edit Timing' button gone
* Pin button and '<Grease Pencil Data' string gone from Action Editor
* Action Editor in 'Grease Pencil' mode now displays all grease-pencil datablocks for current screen. 
* AE: GP-Datablocks are drawn like 'groups', with an expand/collapse button to show/hide layers. Its name shows the type of space it comes from, and shows indicative status info (i.e. for 3d-view, it shows view-angle)
* Added refresh calls for action editor after editing relevant data.

I haven't tested all tools yet, but most should be stable. 

Also, I've removed some unnecessary buttons, and added a few tooltips. There's also some experimental code to try to get clearer indication of 'active' layer.
This commit is contained in:
Joshua Leung
2008-07-23 12:27:08 +00:00
parent ab722cf7b1
commit 8a1dbea363
17 changed files with 222 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/src/header_action.c
View File

@@ -1683,7 +1683,7 @@ void action_buttons(void)
"Channel", xco, -2, xmax-3, 24, "");
xco+= xmax;
}
else if ((G.saction->gpd) && (G.saction->mode==SACTCONT_GPENCIL)) {
else if (G.saction->mode==SACTCONT_GPENCIL) {
xmax= GetButStringLength("Channel");
uiDefPulldownBut(block, action_gplayermenu, NULL,
"Channel", xco, -2, xmax-3, 24, "");
@@ -1722,24 +1722,7 @@ void action_buttons(void)
xco += (90 + 8);
/* MODE-DEPENDENT DRAWING */
if (G.saction->mode == SACTCONT_GPENCIL) {
char gp_name[64];
/* pin button */
uiDefIconButS(block, ICONTOG, B_ACTPIN, ICON_PIN_DEHLT, xco,0,XIC,YIC, &G.saction->pin, 0, 0, 0, 0, "Keeps this view displaying the current data regardless of what Grease Pencil set is active");
xco += (XIC + 5);
/* just a simple string to help identify if any content */
glRasterPos2f((float)xco, 5.0);
BIF_RasterPos((float)xco, 5.0); // stupid texture fonts
BIF_ThemeColor(TH_TEXT);
sprintf(gp_name, (G.saction->gpd)?"Grease Pencil Data":"<None>");
xmax= GetButStringLength(gp_name);
BIF_DrawString(uiBlockGetCurFont(block), gp_name, (U.transopts & USER_TR_BUTTONS));
xco += xmax;
}
else {
if (G.saction->mode != SACTCONT_GPENCIL) {
/* NAME ETC */
ob= OBACT;
from = (ID *)ob;