svn merge ^/trunk/blender -r44235:44250
[blender.git] / source / blender / editors / object / object_edit.c
index b8cc749888c38e36cf9461e29ca898417394adab..a28b5c4feaaea1756a65b3a00db7d3e929483b8e 100644 (file)
@@ -1005,7 +1005,10 @@ static void UNUSED_FUNCTION(copy_attr_menu)(Main *bmain, Scene *scene, View3D *v
         * view3d_edit_object_copyattrmenu() and in toolbox.c
         */
        
-       strcpy(str, "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|Logic Bricks%x10|Protected Transform%x29|%l");
+       strcpy(str,
+              "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|"
+              "Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|"
+              "Logic Bricks%x10|Protected Transform%x29|%l");
        
        strcat (str, "|Object Constraints%x22");
        strcat (str, "|NLA Strips%x26");