Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2005-07-12 19:47:53 +0400
committerTon Roosendaal <ton@blender.org>2005-07-12 19:47:53 +0400
commit1adf750fc3c86a4d3e7d3f42028e93dfb9bf1c47 (patch)
treef6e6cf2b46c1de903a49effaeb67b164eb7c29fa /source/blender/blenkernel/intern/lattice.c
parentd7ab2a584e3c4ee92f8600bbab642ff449729421 (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/blenkernel/intern/lattice.c')
-rw-r--r--source/blender/blenkernel/intern/lattice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index db5dee45d5d..6e3dde28a53 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -642,7 +642,7 @@ static int _object_deform(Object *ob, int applyflag)
return 1;
}
else if(ob->parent->type==OB_ARMATURE) {
- if (ob->partype != PARSKEL){
+ if (ob->partype != PARSKEL || ob->parent==G.obedit){
return 0;
}