archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Constraints UI:

Browse Source 
* Swapped the order of the CSpace menus. This is so that it makes more sense with the Transform Constraint, to follow a source (target) -> destination (owner) flow.

* 'Local Space' option for Objects has been renamed 'Local (Without Parent) Space'
This commit is contained in:
Joshua Leung
2007-07-31 12:36:03 +00:00
parent 2e6624a2b8
commit 5afc4e051f
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/src/buttons_object.c
View File

@@ -484,24 +484,25 @@ void autocomplete_vgroup(char *str, void *arg_v)
*/ */
static void draw_constraint_spaceselect (uiBlock *block, bConstraint *con, short xco, short yco, short owner, short target) static void draw_constraint_spaceselect (uiBlock *block, bConstraint *con, short xco, short yco, short owner, short target)
{ {
short ownx, tarx; short tarx, ownx;
short bwidth; short bwidth;
/* calculate sizes and placement of menus */ /* calculate sizes and placement of menus */
if (owner == -1) { if (owner == -1) {
bwidth = 125; bwidth = 125;
ownx = 0;
tarx = 120; tarx = 120;
ownx = 0;
} }
else if (target == -1) { else if (target == -1) {
bwidth = 125; bwidth = 125;
ownx = 120;
tarx = 0; tarx = 0;
ownx = 120;
} }
else { else {
bwidth = 100; bwidth = 100;
ownx = 95; tarx = 95;
tarx = ownx + bwidth; ownx = tarx + bwidth;
} }
@@ -509,26 +510,26 @@ static void draw_constraint_spaceselect (uiBlock *block, bConstraint *con, short
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
/* Owner-Space */
if (owner == 1) {
uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Owner Space %t|World Space %x0|Pose Space %x3|Local with Parent %x4|Local Space %x1",
ownx, yco, bwidth, 18, &con->ownspace, 0, 0, 0, 0, "Choose space that owner is evaluated in");
}
else if (owner == 0) {
uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Owner Space %t|World Space %x0|Local Space %x1",
ownx, yco, bwidth, 18, &con->ownspace, 0, 0, 0, 0, "Choose space that owner is evaluated in");
}
/* Target-Space */ /* Target-Space */
if (target == 1) { if (target == 1) {
uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Target Space %t|World Space %x0|Pose Space %x3|Local with Parent %x4|Local Space %x1", uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Target Space %t|World Space %x0|Pose Space %x3|Local with Parent %x4|Local Space %x1",
tarx, yco, bwidth, 18, &con->tarspace, 0, 0, 0, 0, "Choose space that target is evaluated in"); tarx, yco, bwidth, 18, &con->tarspace, 0, 0, 0, 0, "Choose space that target is evaluated in");
} }
else if (target == 0) { else if (target == 0) {
uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Target Space %t|World Space %x0|Local Space %x1", uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Target Space %t|World Space %x0|Local (Without Parent) Space %x1",
tarx, yco, bwidth, 18, &con->tarspace, 0, 0, 0, 0, "Choose space that target is evaluated in"); tarx, yco, bwidth, 18, &con->tarspace, 0, 0, 0, 0, "Choose space that target is evaluated in");
} }
/* Owner-Space */
if (owner == 1) {
uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Owner Space %t|World Space %x0|Pose Space %x3|Local with Parent %x4|Local Space %x1",
ownx, yco, bwidth, 18, &con->ownspace, 0, 0, 0, 0, "Choose space that owner is evaluated in");
}
else if (owner == 0) {
uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Owner Space %t|World Space %x0|Local (Without Parent) Space %x1",
ownx, yco, bwidth, 18, &con->ownspace, 0, 0, 0, 0, "Choose space that owner is evaluated in");
}
uiBlockEndAlign(block); uiBlockEndAlign(block);
} }