diff options
author | Bastien Montagne <bastien@blender.org> | 2020-05-20 16:31:54 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-05-20 16:31:54 +0300 |
commit | e1050fb3958036f3a7c0f2cc4cd91366f1c84160 (patch) | |
tree | 1bc2238bfbc1b06c20b9fd225b7b838c8e617f03 /source/blender/makesrna/intern/rna_object.c | |
parent | 22c30219e7bcfb019b4b31e4357ce5585582d935 (diff) | |
parent | 9897ef6a20dbbcf834ea949013daebfdd0b4e6de (diff) |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index c2ee256ad58..a27d77df32a 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2890,6 +2890,7 @@ static void rna_def_object(BlenderRNA *brna) 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_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); RNA_def_property_ui_text( prop, "Parent Inverse Matrix", "Inverse of object's parent matrix at time of parenting"); RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update"); |