diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-07 13:23:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-07 13:23:29 +0400 |
| commit | dfe7cde9f1a8dc90d6d77e2c1108bcb0e87eef82 (patch) | |
| tree | ce7653532d1d2364a3e27dd4683a7daa1f53ed9f /source/blender/editors/object/object_edit.c | |
| parent | 77476b294f8a7a74ee6f19ff8bfcbb3fb26e3bda (diff) | |
- rna path lookup crashed if the string was null (reported by Cessen with an empty driver)
- added TexMesh access ([#19505] Missing option : TexMesh)
- Ctrl+Tab works again, not-so-nice workaround, disallow switching to paint modes from editmode, but would be nicer to manage this with keymaps.
Diffstat (limited to 'source/blender/editors/object/object_edit.c')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 54df3ae92da..268cd3b3542 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -1995,6 +1995,12 @@ static int object_mode_set_exec(bContext *C, wmOperator *op) if(!ob || !object_mode_set_compat(C, op, ob)) return OPERATOR_PASS_THROUGH; + /* Irritating workaround! disallow paint modes from editmode since a number of shortcuts conflict + * XXX - would be much better to handle this on a keymap level */ + if(ob->mode == OB_MODE_EDIT && ELEM6(mode, OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT, OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT, OB_MODE_PARTICLE_EDIT, OB_MODE_POSE)) { + return OPERATOR_PASS_THROUGH; + } + /* Exit current mode if it's not the mode we're setting */ if(ob->mode != OB_MODE_OBJECT && ob->mode != mode) WM_operator_name_call(C, object_mode_op_string(ob->mode), WM_OP_EXEC_REGION_WIN, NULL); |