From 1e5bdbcb2f872d4a55dc6bab7908489001f2ad88 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 12 Apr 2007 06:12:17 +0000 Subject: [PATCH] added another copy option 'protected transform' makes changing the protection values all at once possible --- source/blender/src/editobject.c | 7 +++++-- source/blender/src/header_view3d.c | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 27e05f60c70..02adb3b12db 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -3282,6 +3282,9 @@ void copy_attr(short event) cu1->flag &= ~CU_UV_ORCO; } } + else if(event==29) { /* protected bits */ + base->object->protectflag= ob->protectflag; + } } } base= base->next; @@ -3360,7 +3363,7 @@ void copy_attr_menu() char str[512]; - strcpy(str, "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Drawtype%x4|Time Offset%x5|Dupli%x6|%l|Mass%x7|Damping%x8|Properties%x9|Logic Bricks%x10|%l"); + strcpy(str, "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Drawtype%x4|Time Offset%x5|Dupli%x6|%l|Mass%x7|Damping%x8|Properties%x9|Logic Bricks%x10|Protected Transform%x29|%l"); strcat (str, "|Object Constraints%x22"); strcat (str, "|NLA Strips%x26"); @@ -3377,7 +3380,7 @@ void copy_attr_menu() } if(ob->type==OB_MESH){ - strcat(str, "|Subdiv%x21|AutoSmooth%x27"); + strcat(str, "|Subsurf Settings%x21|AutoSmooth%x27"); } if( give_parteff(ob) ) strcat(str, "|Particle Settings%x20"); diff --git a/source/blender/src/header_view3d.c b/source/blender/src/header_view3d.c index 688c8842e5e..c0bf857826f 100644 --- a/source/blender/src/header_view3d.c +++ b/source/blender/src/header_view3d.c @@ -2044,6 +2044,7 @@ static void do_view3d_edit_object_copyattrmenu(void *arg, int event) case 24: case 25: case 26: + case 29: copy_attr((short)event); break; } @@ -2075,6 +2076,7 @@ static uiBlock *view3d_edit_object_copyattrmenu(void *arg_unused) uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Damping|Ctrl C, 8", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Properties|Ctrl C, 9", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Logic Bricks|Ctrl C, 10", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 10, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Protected Transform |Ctrl C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 29, ""); uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, ""); @@ -2099,7 +2101,7 @@ static uiBlock *view3d_edit_object_copyattrmenu(void *arg_unused) } if(ob->type==OB_MESH) { - uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Subdiv|Ctrl C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 21, ""); + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Subsurf Settings|Ctrl C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 21, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Modifiers ...|Ctrl C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 24, ""); }