diff options
| author | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-08-19 21:15:30 +0400 |
|---|---|---|
| committer | Jason Hays <jason_hays22@mymail.eku.edu> | 2011-08-19 21:15:30 +0400 |
| commit | c58fb76f1a043124debf2a71e6c56f2a478a0dde (patch) | |
| tree | 393c06981022e6159df7c6b9efc3b5062ab7f6af /source/blender/makesrna/intern/rna_object.c | |
| parent | c57d64468bc9009a11cafdbf0cc66e83cdaa6841 (diff) | |
| parent | 3a81f23e0975ea87ade780965462ad5b15b39d95 (diff) | |
Merged 39338-39558
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 1bbe6446b69..d7440ad9ddb 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2040,7 +2040,14 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Input Matrix", "Matrix access to location, rotation and scale (including deltas), before constraints and parenting are applied."); RNA_def_property_float_funcs(prop, "rna_Object_matrix_basis_get", "rna_Object_matrix_basis_set", NULL); RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); - + + /*parent_inverse*/ + prop= RNA_def_property(srna, "matrix_parent_inverse", PROP_FLOAT, PROP_MATRIX); + RNA_def_property_float_sdna(prop, NULL, "parentinv"); + RNA_def_property_multi_array(prop, 2, rna_matrix_dimsize_4x4); + RNA_def_property_ui_text(prop, "Matrix", "Inverse of object's parent matrix at time of parenting"); + RNA_def_property_update(prop, NC_OBJECT|ND_TRANSFORM, "rna_Object_internal_update"); + /* collections */ prop= RNA_def_property(srna, "constraints", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "Constraint"); |