svn merge -r 12208:12294 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / src / editobject.c
index 1062649a8f2b910e42d782e86646f1e1595f13b3..8f35e64b79fe4d2107993f1916cc80a92974dcf0 100644 (file)
@@ -1082,7 +1082,7 @@ void reset_slowparents(void)
 {
        /* back to original locations */
        Base *base;
-       
+
        base= FIRSTBASE;
        while(base) {
                if(base->object->parent) {
@@ -1740,7 +1740,7 @@ void exit_editmode(int flag)      /* freedata==0 at render, 1= freedata, 2= do undo b
        /* total remake of softbody data */
        if(modifiers_isSoftbodyEnabled(ob)) {
                if (ob->soft && ob->soft->keys) {
-                       notice("Erased Baked SoftBody");
+                       notice("Erase Baked SoftBody");
                }
 
                sbObjectToSoftbody(ob);
@@ -2428,12 +2428,12 @@ void special_editmenu(void)
                        esubdivideflag(1, fac, G.scene->toolsettings->editbutflag | B_SMOOTH, 1, 0);
                        BIF_undo_push("Subdivide Smooth");
                        break;          
-                       
+
                case 4:
                        mergemenu();
                        break;
                case 5:
-                       notice("Removed %d Vertices", removedoublesflag(1, G.scene->toolsettings->doublimit));
+                       notice("Removed %d Vertices", removedoublesflag(1, 1, G.scene->toolsettings->doublimit));
                        BIF_undo_push("Remove Doubles");
                        break;
                case 6:
@@ -3386,6 +3386,9 @@ void copy_attr(short event)
                                else if(event==29) { /* protected bits */
                                        base->object->protectflag= ob->protectflag;
                                }
+                               else if(event==30) { /* index object */
+                                       base->object->index= ob->index;
+                               }
                        }
                }
                base= base->next;
@@ -3448,6 +3451,8 @@ void copy_attr_menu()
 
        if(ob->soft) strcat(str, "|Soft Body Settings%x23");
        
+       strcat(str, "|Pass Index%x30");
+       
        if(ob->type==OB_MESH || ob->type==OB_CURVE || ob->type==OB_LATTICE || ob->type==OB_SURF){
                strcat(str, "|Modifiers ...%x24");
        }