diff options
| -rw-r--r-- | release/scripts/ui/space_image.py | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_add.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/util/editmode_undo.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index f6b5b75da73..95425958f3e 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -208,7 +208,7 @@ class IMAGE_MT_uvs(bpy.types.Menu): layout.itemS() - layout.itemR(settings, "proportional_editing") + layout.item_menu_enumR(settings, "proportional_editing") layout.item_menu_enumR(settings, "proportional_editing_falloff") layout.itemS() diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 63bb3f87480..80426fd6a49 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -264,6 +264,7 @@ static Object *effector_add_type(bContext *C, wmOperator *op, int type) if(type==PFIELD_GUIDE) { ob= ED_object_add_type(C, OB_CURVE, view_align, FALSE); + rename_id(&ob->id, "CurveGuide"); ((Curve*)ob->data)->flag |= CU_PATH|CU_3D; ED_object_enter_editmode(C, 0); @@ -274,6 +275,8 @@ static Object *effector_add_type(bContext *C, wmOperator *op, int type) } else { ob= ED_object_add_type(C, OB_EMPTY, view_align, FALSE); + rename_id(&ob->id, "Field"); + switch(type) { case PFIELD_WIND: case PFIELD_VORTEX: diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c index 2d73a9f1d25..5fb93b0f8ec 100644 --- a/source/blender/editors/util/editmode_undo.c +++ b/source/blender/editors/util/editmode_undo.c @@ -240,6 +240,7 @@ static void undo_clean_stack(bContext *C) /* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */ void undo_editmode_step(bContext *C, int step) { + Object *obedit= CTX_data_edit_object(C); /* prevent undo to happen on wrong object, stack can be a mix */ undo_clean_stack(C); @@ -266,8 +267,9 @@ void undo_editmode_step(bContext *C, int step) if(G.f & G_DEBUG) printf("redo %s\n", curundo->name); } } + + DAG_id_flush_update(&obedit->id, OB_RECALC_DATA); -// DAG_id_flush_update(&obedit->id, OB_RECALC_DATA); /* XXX notifiers */ } |