diff options
author | Ton Roosendaal <ton@blender.org> | 2005-07-12 19:47:53 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-07-12 19:47:53 +0400 |
commit | 1adf750fc3c86a4d3e7d3f42028e93dfb9bf1c47 (patch) | |
tree | f6e6cf2b46c1de903a49effaeb67b164eb7c29fa /source/blender/src/resources.c | |
parent | d7ab2a584e3c4ee92f8600bbab642ff449729421 (diff) |
Cleanup of Armature 3d drawing.
- In Solid drawmode, bones get drawn solid too now. Including Outline-
selection color, if that's set.
Disable it by setting Object-buttons "drawtype" for the Armature.
Color used for solid bones is in Theme editor.
- EditMode armature now follows (Mesh edit) theme colors (Vertex, Edge)
- PoseMode armature has ThemeColor for selection, and draws three extra
colors now;
- blue shade for bones with action Ipos
- yellow for bones with IK
- green for bones with a constraint
- "X ray" now only works for PoseMode... needs review, can be done better
- "Draw Names" option uses theme color too, also indicates selection.
Fixes;
- In Armature EditMode, the deformed Mesh goes to rest-position
- Border select didn't clear 'active' flag in Bones in PoseMode
- Mouse-click select didn't work when a dashed line was close to Bone
Diffstat (limited to 'source/blender/src/resources.c')
-rw-r--r-- | source/blender/src/resources.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index c6f3d6c8ec4..c7d0f62b2a1 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -509,6 +509,10 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) cp= &ts->facedot_size; break; case TH_NORMAL: cp= ts->normal; break; + case TH_BONE_SOLID: + cp= ts->bone_solid; break; + case TH_BONE_POSE: + cp= ts->bone_pose; break; case TH_SYNTAX_B: cp= ts->syntaxb; break; @@ -601,6 +605,10 @@ void BIF_InitTheme(void) SETCOL(btheme->tv3d.face_dot, 255, 138, 48, 255); btheme->tv3d.facedot_size= 4; + SETCOL(btheme->tv3d.bone_solid, 200, 200, 200, 255); + SETCOL(btheme->tv3d.bone_pose, 80, 200, 255, 100); // alpha 100 is not meant editable, used for wire+action draw + + /* space buttons */ /* to have something initialized */ btheme->tbuts= btheme->tv3d; @@ -759,6 +767,8 @@ char *BIF_ThemeColorsPup(int spacetype) sprintf(str, "Face Dot Selected %%x%d|", TH_FACE_DOT); strcat(cp, str); sprintf(str, "Face Dot Size %%x%d|", TH_FACEDOT_SIZE); strcat(cp, str); sprintf(str, "Normal %%x%d", TH_NORMAL); strcat(cp, str); + sprintf(str, "Bone Solid %%x%d", TH_BONE_SOLID); strcat(cp, str); + sprintf(str, "Bone Pose %%x%d", TH_BONE_POSE); strcat(cp, str); } else if(spacetype==SPACE_IPO) { sprintf(str, "Panel %%x%d|", TH_PANEL); strcat(cp, str); |