Revision: 17461
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17461
Author: theeth
Date: 2008-11-14 18:33:15 +0100 (Fri, 14 Nov 2008)
Log Message:
-----------
Pkey toggle sketching panel
(it used to do select parent, but that's already done with [ and ] for
children, no need for a second key).
Modified Paths:
--------------
branches/etch-a-ton/source/blender/src/editarmature_sketch.c
branches/etch-a-ton/source/blender/src/space.c
Modified: branches/etch-a-ton/source/blender/src/editarmature_sketch.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_sketch.c
2008-11-14 17:30:55 UTC (rev 17460)
+++ branches/etch-a-ton/source/blender/src/editarmature_sketch.c
2008-11-14 17:33:15 UTC (rev 17461)
@@ -209,7 +209,6 @@
if (TEMPLATES_CURRENT == 0 && G.scene->toolsettings->skgen_template !=
NULL)
{
GHashIterator ghi;
- int index = 0;
BLI_ghashIterator_init(&ghi, TEMPLATES_HASH);
while (!BLI_ghashIterator_isDone(&ghi))
@@ -217,11 +216,9 @@
Object *ob = BLI_ghashIterator_getValue(&ghi);
int key = (int)BLI_ghashIterator_getKey(&ghi);
- index++;
-
if (ob == G.scene->toolsettings->skgen_template)
{
- TEMPLATES_CURRENT = index;
+ TEMPLATES_CURRENT = key;
break;
}
Modified: branches/etch-a-ton/source/blender/src/space.c
===================================================================
--- branches/etch-a-ton/source/blender/src/space.c 2008-11-14 17:30:55 UTC
(rev 17460)
+++ branches/etch-a-ton/source/blender/src/space.c 2008-11-14 17:33:15 UTC
(rev 17461)
@@ -2516,8 +2516,11 @@
else if(G.qual==LR_ALTKEY &&
G.obedit->type==OB_ARMATURE)
clear_bone_parent();
- else if((G.qual==0) &&
(G.obedit->type==OB_ARMATURE))
-
armature_select_hierarchy(BONE_SELECT_PARENT, 1); // 1 = add to selection
+ else if((G.qual==0) &&
(G.obedit->type==OB_ARMATURE))
+ {
+ toggle_blockhandler(curarea,
VIEW3D_HANDLER_BONESKETCH, UI_PNL_TO_MOUSE);
+ allqueue(REDRAWVIEW3D, 0);
+ }
else
if((G.qual==(LR_CTRLKEY|LR_ALTKEY)) && (G.obedit->type==OB_ARMATURE))
separate_armature();
else if((G.qual==0) &&
G.obedit->type==OB_MESH)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
