Commit: 1a366cb02a35d8b7b73a69ffdcd4acfccc3ee383
Author: Antony Riakiotakis
Date: Mon Dec 15 14:01:53 2014 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB1a366cb02a35d8b7b73a69ffdcd4acfccc3ee383
Fix selection id not getting incremented in face-map bones
===================================================================
M source/blender/editors/space_view3d/drawarmature.c
M source/blender/editors/space_view3d/space_view3d.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawarmature.c
b/source/blender/editors/space_view3d/drawarmature.c
index 24d0254..d13c505 100644
--- a/source/blender/editors/space_view3d/drawarmature.c
+++ b/source/blender/editors/space_view3d/drawarmature.c
@@ -1730,20 +1730,20 @@ static void draw_pose_bones(Scene *scene, View3D *v3d,
ARegion *ar, Base *base,
index = base->selcol;
for (pchan = ob->pose->chanbase.first; pchan; pchan =
pchan->next) {
+ bool use_custom;
bone = pchan->bone;
arm->layer_used |= bone->layer;
+ use_custom = (pchan->custom) && !(arm->flag &
ARM_NO_CUSTOM);
/* 1) bone must be visible, 2) for OpenGL
select-drawing cannot have unselectable [#27194] */
if (((bone->flag & (BONE_HIDDEN_P | BONE_HIDDEN_PG)) ==
0) &&
- ((G.f & G_PICKSEL) == 0 || (bone->flag &
BONE_UNSELECTABLE) == 0))
+ ((G.f & G_PICKSEL) == 0 || (bone->flag &
BONE_UNSELECTABLE) == 0) &&
+ !(use_custom && pchan->custom_fmap))
{
if (bone->layer & arm->layer) {
const bool use_custom = (pchan->custom)
&& !(arm->flag & ARM_NO_CUSTOM);
/* skip drawing in that case */
- if (use_custom && pchan->custom_fmap)
- continue;
-
glPushMatrix();
if (use_custom && pchan->custom_tx) {
diff --git a/source/blender/editors/space_view3d/space_view3d.c
b/source/blender/editors/space_view3d/space_view3d.c
index a485cd4..ec63e6c 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -735,7 +735,7 @@ static void WIDGETGROUP_camera_draw(const struct bContext
*C, struct wmWidgetGro
WM_widget_set_scale(widget, ca->drawsize);
}
-
+#if 0
static int WIDGETGROUP_shapekey_poll(const struct bContext *C, struct
wmWidgetGroupType *UNUSED(wgrouptype))
{
Object *ob = CTX_data_active_object(C);
@@ -774,7 +774,7 @@ static void WIDGETGROUP_shapekey_draw(const struct bContext
*C, struct wmWidgetG
negate_v3_v3(dir, ob->obmat[2]);
WIDGET_arrow_set_direction(widget, dir);
}
-
+#endif
static void view3d_widgets(void)
{
@@ -789,7 +789,6 @@ static void view3d_widgets(void)
WIDGETGROUP_manipulator_poll,
WIDGETGROUP_manipulator_update);
#endif
-
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
