[Bf-blender-cvs] [d9510f02c8f] master: Animation: separate constraint owner space descriptions for objects

Damien Picard noreply at git.blender.org
Thu Dec 22 16:54:11 CET 2022


Commit: d9510f02c8f3b5ff9b692bb03359bd962a800ba4
Author: Damien Picard
Date:   Thu Dec 22 16:52:17 2022 +0100
Branches: master
https://developer.blender.org/rBd9510f02c8f3b5ff9b692bb03359bd962a800ba4

Animation: separate constraint owner space descriptions for objects

Until now the owner spaces in the object constraint properties used the
same descriptions as the target spaces, unlike bone constraints.

For instance, if you chose World Space as owner space, you'd get the
description: "The transformation of the target is evaluated relative to
the world coordinate system".

Reuse the existing descriptions from the bone constraints instead, so
now you get: "The constraint is applied relative to the world coordinate
system".

Reviewed By: sybren

Maniphest Tasks: T43295

Differential Revision: https://developer.blender.org/D16747

===================================================================

M	source/blender/makesrna/intern/rna_constraint.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c
index 719c7441174..671286be052 100644
--- a/source/blender/makesrna/intern/rna_constraint.c
+++ b/source/blender/makesrna/intern/rna_constraint.c
@@ -279,7 +279,26 @@ static const EnumPropertyItem euler_order_items[] = {
 
 #ifdef RNA_RUNTIME
 
-static const EnumPropertyItem space_object_items[] = {
+static const EnumPropertyItem owner_space_object_items[] = {
+    {CONSTRAINT_SPACE_WORLD,
+     "WORLD",
+     0,
+     "World Space",
+     "The constraint is applied relative to the world coordinate system"},
+    {CONSTRAINT_SPACE_CUSTOM,
+     "CUSTOM",
+     0,
+     "Custom Space",
+     "The constraint is applied in local space of a custom object/bone/vertex group"},
+    {CONSTRAINT_SPACE_LOCAL,
+     "LOCAL",
+     0,
+     "Local Space",
+     "The constraint is applied relative to the local coordinate system of the object"},
+    {0, NULL, 0, NULL, NULL},
+};
+
+static const EnumPropertyItem target_space_object_items[] = {
     {CONSTRAINT_SPACE_WORLD,
      "WORLD",
      0,
@@ -588,7 +607,7 @@ static const EnumPropertyItem *rna_Constraint_owner_space_itemf(bContext *UNUSED
   }
   else {
     /* object */
-    return space_object_items;
+    return owner_space_object_items;
   }
 }
 
@@ -615,7 +634,7 @@ static const EnumPropertyItem *rna_Constraint_target_space_itemf(bContext *UNUSE
     }
   }
 
-  return space_object_items;
+  return target_space_object_items;
 }
 
 static bConstraintTarget *rna_ArmatureConstraint_target_new(ID *id, bConstraint *con, Main *bmain)



More information about the Bf-blender-cvs mailing list