[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56978] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: Added display of active bone (in 3DView ) when weight painting a mesh Object
Gaia Clary
gaia.clary at machinimatrix.org
Thu May 23 18:24:36 CEST 2013
Revision: 56978
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56978
Author: gaiaclary
Date: 2013-05-23 16:24:36 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Added display of active bone (in 3DView) when weight painting a mesh Object
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-05-23 16:01:25 UTC (rev 56977)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-05-23 16:24:36 UTC (rev 56978)
@@ -914,7 +914,8 @@
Key *key = NULL;
KeyBlock *kb = NULL;
char shapes[MAX_NAME + 10];
-
+ char *bone_name = NULL;
+
/* try to display active shapekey too */
shapes[0] = '\0';
key = BKE_key_from_object(ob);
@@ -928,10 +929,29 @@
}
}
- if (markern)
- BLI_snprintf(info, sizeof(info), "(%d) %s %s <%s>", CFRA, ob->id.name + 2, shapes, markern);
- else
- BLI_snprintf(info, sizeof(info), "(%d) %s %s", CFRA, ob->id.name + 2, shapes);
+ if (ob->type == OB_MESH) {
+ Object *armobj = BKE_object_pose_armature_get(ob);
+ if (armobj && armobj->mode & OB_MODE_POSE) {
+ bArmature *arm = armobj->data;
+ if (arm->act_bone) {
+ if (arm->act_bone->layer & arm->layer)
+ bone_name = arm->act_bone->name;
+ }
+ }
+ }
+
+ if (bone_name) {
+ if (markern)
+ BLI_snprintf(info, sizeof(info), "(%d) %s %s %s <%s>", CFRA, ob->id.name + 2, bone_name, shapes, markern);
+ else
+ BLI_snprintf(info, sizeof(info), "(%d) %s %s %s", CFRA, ob->id.name + 2, bone_name, shapes);
+ }
+ else {
+ if (markern)
+ BLI_snprintf(info, sizeof(info), "(%d) %s %s <%s>", CFRA, ob->id.name + 2, shapes, markern);
+ else
+ BLI_snprintf(info, sizeof(info), "(%d) %s %s", CFRA, ob->id.name + 2, shapes);
+ }
}
else {
/* standard object */
More information about the Bf-blender-cvs
mailing list