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:
authorJoshua Leung <aligorith@gmail.com>2009-09-23 11:28:26 +0400
committerJoshua Leung <aligorith@gmail.com>2009-09-23 11:28:26 +0400
commit9e110a6d00e791b7fa7cc4ba559b68acac029c5b (patch)
treed984890eb9f4a02c58385651b104d1bb0cf10d75
parentefa757fd8d57891f6feb3fc85fdd3e2ab88e7623 (diff)
A few quick bugfixes:
* Vertex Groups list now has a more normal length (2 rows by default) * Copy vertex groups button now has an icon * Pose Sliding tools now allow events which it doesn't process to pass through (i.e. zooming the view now works, and also moving around using the numpad works too)
-rw-r--r--release/ui/buttons_data_mesh.py6
-rw-r--r--source/blender/editors/armature/poseSlide.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py
index 33b3960b381..a93d7b66397 100644
--- a/release/ui/buttons_data_mesh.py
+++ b/release/ui/buttons_data_mesh.py
@@ -60,15 +60,15 @@ class DATA_PT_vertex_groups(DataButtonsPanel):
ob = context.object
row = layout.row()
- row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index")
+ row.template_list(ob, "vertex_groups", ob, "active_vertex_group_index", rows=2)
col = row.column(align=True)
col.itemO("object.vertex_group_add", icon='ICON_ZOOMIN', text="")
col.itemO("object.vertex_group_remove", icon='ICON_ZOOMOUT', text="")
- col.itemO("object.vertex_group_copy", icon='ICON_BLANK1', text="")
+ col.itemO("object.vertex_group_copy", icon='ICON_COPYDOWN', text="")
if ob.data.users > 1:
- col.itemO("object.vertex_group_copy_to_linked", icon='ICON_BLANK1', text="")
+ col.itemO("object.vertex_group_copy_to_linked", icon='ICON_COPYDOWN', text="")
group = ob.active_vertex_group
if group:
diff --git a/source/blender/editors/armature/poseSlide.c b/source/blender/editors/armature/poseSlide.c
index 24bd2ebe5ad..7c63954767f 100644
--- a/source/blender/editors/armature/poseSlide.c
+++ b/source/blender/editors/armature/poseSlide.c
@@ -721,6 +721,10 @@ static int pose_slide_modal (bContext *C, wmOperator *op, wmEvent *evt)
pose_slide_apply(C, op, pso);
}
break;
+
+ default: /* unhandled event (maybe it was some view manip? */
+ /* allow to pass through */
+ return OPERATOR_RUNNING_MODAL|OPERATOR_PASS_THROUGH;
}
/* still running... */