diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-12-27 21:54:43 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-12-27 21:54:43 +0300 |
| commit | 1a8cc0a8f051c92e03bee4ad9cb4ae0727b0a4e5 (patch) | |
| tree | 1639852ec8b79dad83ef86045dd3a63f126c75eb /source/blender/editors/object | |
| parent | 595525067e9138441fe841edfbda7100ac560624 (diff) | |
Small fixes:
- OpenGL still render failed when output format was set to Movie.
Now it just doesn't save a file and renders anyway.
- Bone heat weight was missing 'wait cursor'.
- Waitcursor for Mac Cocoa is back! Made all OS's use the same
nice hourglass cursor.
(Note: this violates Mac UI guidelines, we should rely on the
spinning wheel of death instead. Highly disputable that.)
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 63c9e394705..5f8996f23fe 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -655,9 +655,11 @@ static int parent_set_exec(bContext *C, wmOperator *op) create_vgroups_from_armature(op->reports, scene, ob, par, ARM_GROUPS_NAME, 0); else if(partype == PAR_ARMATURE_ENVELOPE) create_vgroups_from_armature(op->reports, scene, ob, par, ARM_GROUPS_ENVELOPE, 0); - else if(partype == PAR_ARMATURE_AUTO) + else if(partype == PAR_ARMATURE_AUTO) { + WM_cursor_wait(1); create_vgroups_from_armature(op->reports, scene, ob, par, ARM_GROUPS_AUTO, 0); - + WM_cursor_wait(0); + } /* get corrected inverse */ ob->partype= PAROBJECT; what_does_parent(scene, ob, &workob); |