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

A few minor changes:

Browse Source 
* Removed obsolete comments from constraints code
* ChildOf constraint buttons: Set/Clear Inverse are now Set/Clear Offset. Hopefully that makes it a bit clearer for users.
This commit is contained in:
Joshua Leung
2007-07-15 07:05:24 +00:00
parent bc9e6f9731
commit 38c84ba938
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/constraint.c
View File

@@ -1051,7 +1051,6 @@ static void constraint_mat_convertspace (Object *ob, bPoseChannel *pchan, float
/* generic function to get the appropriate matrix for most target cases */ /* generic function to get the appropriate matrix for most target cases */
/* The cases where the target can be object data have not been implemented */ /* The cases where the target can be object data have not been implemented */
// TODO: add 'space' handling stuff here!
static void constraint_target_to_mat4 (Object *ob, const char *substring, float mat[][4], short from, short to) static void constraint_target_to_mat4 (Object *ob, const char *substring, float mat[][4], short from, short to)
{ {
/* Case OBJECT */ /* Case OBJECT */

5
source/blender/src/buttons_editing.c
View File

@@ -3480,9 +3480,8 @@ static void build_bonestring (char *string, EditBone *bone)
int index, numbones, i; int index, numbones, i;
char (*qsort_ptr)[32] = NULL; char (*qsort_ptr)[32] = NULL;
sprintf (string, "Parent%%t| %%x%d", -1); /* That space is there /* That space is there for a reason - for no parent */
* for a reason sprintf (string, "Parent%%t| %%x%d", -1);
*/
numbones = BLI_countlist(&G.edbo); numbones = BLI_countlist(&G.edbo);

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

@@ -837,10 +837,10 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s
/* Inverse options */ /* Inverse options */
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
but=uiDefBut(block, BUT, B_CONSTRAINT_TEST, "Set Inverse", *xco, *yco-151, (width/2),18, NULL, 0, 24, 0, 0, "Calculate current Parent-Inverse Matrix"); but=uiDefBut(block, BUT, B_CONSTRAINT_TEST, "Set Offset", *xco, *yco-151, (width/2),18, NULL, 0, 24, 0, 0, "Calculate current Parent-Inverse Matrix (i.e. restore offset from parent)");
uiButSetFunc(but, childof_const_setinv, data, NULL); uiButSetFunc(but, childof_const_setinv, data, NULL);
but=uiDefBut(block, BUT, B_CONSTRAINT_TEST, "Clear Inverse", *xco+((width/2)+10), *yco-151, (width/2),18, NULL, 0, 24, 0, 0, "Clear Parent-Inverse Matrix"); but=uiDefBut(block, BUT, B_CONSTRAINT_TEST, "Clear Offset", *xco+((width/2)+10), *yco-151, (width/2),18, NULL, 0, 24, 0, 0, "Clear Parent-Inverse Matrix (i.e. clear offset from parent)");
uiButSetFunc(but, childof_const_clearinv, data, NULL); uiButSetFunc(but, childof_const_clearinv, data, NULL);
uiBlockEndAlign(block); uiBlockEndAlign(block);
} }

4
source/blender/src/editconstraint.c
View File

@@ -308,7 +308,7 @@ static void test_constraints (Object *owner, const char* substring)
break; break;
} }
/* Cycle constraints */ /* Check all constraints - is constraint valid? */
if (conlist) { if (conlist) {
for (curcon = conlist->first; curcon; curcon=curcon->next) { for (curcon = conlist->first; curcon; curcon=curcon->next) {
curcon->flag &= ~CONSTRAINT_DISABLE; curcon->flag &= ~CONSTRAINT_DISABLE;
@@ -952,7 +952,7 @@ void validate_pyconstraint_cb(void *arg1, void *arg2)
int index = *((int *)arg2); int index = *((int *)arg2);
int i; int i;
/* innovative use of a for loop to search */ /* innovative use of a for...loop to search */
for (text=G.main->text.first, i=1; text && index!=i; i++, text=text->id.next); for (text=G.main->text.first, i=1; text && index!=i; i++, text=text->id.next);
data->text = text; data->text = text;
} }