* Fix for [#19700] undo doesn't display visual feedback on lattices

Depgraph update was commented out in undo system because of globals, restored this with new context/id-based depgraph

* Fix in UV editor UV menu
* Slightly nicer default names for adding forcefields with Add menu

diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index f6b5b75da732d8e9422b8914b776271b47b20890..95425958f3e44aa757cd45b24f0c20a8c905c578 100644 (file)
--- 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 63bb3f87480a5bfb990b77d49d21bdf793450282..80426fd6a494a8c5f533f30641ce87dfff2c9cfb 100644 (file)
--- 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 2d73a9f1d25eed6ab044e8f797d19fe3263effb6..5fb93b0f8ec36cf17c7ececed4b50af8612a7b77 100644 (file)
--- 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 */
 }