Revision: 15803
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15803
Author: aligorith
Date: 2008-07-27 13:41:39 +0200 (Sun, 27 Jul 2008)
Log Message:
-----------
Bugfix #17334:
This bug-report revealed a critical error made in the menus for Constraints
Owner/Target spaces. It seems that the wrong values have been used for 'pose
space' and 'local with parent' space. This has now been rectified, so that old
rigs won't break (just that the labels will be a bit different).
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/src/buttons_object.c
Modified: trunk/blender/source/blender/makesdna/DNA_constraint_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_constraint_types.h
2008-07-27 11:27:59 UTC (rev 15802)
+++ trunk/blender/source/blender/makesdna/DNA_constraint_types.h
2008-07-27 11:41:39 UTC (rev 15803)
@@ -375,11 +375,13 @@
/* for objects (relative to parent/without parent influence),
* for bones (along normals of bone, without
parent/restpositions)
*/
- CONSTRAINT_SPACE_LOCAL,
+ CONSTRAINT_SPACE_LOCAL, /* = 1 */
/* for posechannels - pose space */
- CONSTRAINT_SPACE_POSE,
- /* for posechannels - local with parent */
- CONSTRAINT_SPACE_PARLOCAL,
+ CONSTRAINT_SPACE_POSE, /* = 2 */
+ /* for posechannels - local with parent */
+ CONSTRAINT_SPACE_PARLOCAL, /* = 3 */
+ /* for files from between 2.43-2.46 (should have been parlocal)
*/
+ CONSTRAINT_SPACE_INVALID, /* = 4. do not exchange for anything! */
} B_CONSTRAINT_SPACETYPES;
/* bConstraintChannel.flag */
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-07-27 11:27:59 UTC
(rev 15802)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-07-27 11:41:39 UTC
(rev 15803)
@@ -480,7 +480,7 @@
/* Target-Space */
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 %x2|Local with Parent %x3|Local Space %x1",
tarx, yco, bwidth, 18, &con->tarspace, 0, 0, 0, 0, "Choose
space that target is evaluated in");
}
else if (target == 0) {
@@ -490,7 +490,7 @@
/* 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",
+ uiDefButC(block, MENU, B_CONSTRAINT_TEST, "Owner Space %t|World
Space %x0|Pose Space %x2|Local with Parent %x3|Local Space %x1",
ownx, yco, bwidth, 18, &con->ownspace, 0, 0, 0, 0, "Choose
space that owner is evaluated in");
}
else if (owner == 0) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
