diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-18 21:29:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-18 21:59:27 +0300 |
commit | 569273c23454bbd20fb060787bd733163dc444dc (patch) | |
tree | 1b277d90d29f1d7be7d55f4d866e4247464653e2 /source/blender/makesrna/intern/rna_object.c | |
parent | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (diff) | |
parent | 1beb6b43c162f657607b49df9d583b38a160d683 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index d3096bbb6bb..e37446028be 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -218,6 +218,12 @@ static void rna_Object_internal_update(Main *UNUSED(bmain), Scene *UNUSED(scene) DEG_id_tag_update(ptr->id.data, OB_RECALC_OB); } +static void rna_Object_internal_update_draw(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +{ + DEG_id_tag_update(ptr->id.data, OB_RECALC_OB); + WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data); +} + static void rna_Object_matrix_world_update(Main *bmain, Scene *scene, PointerRNA *ptr) { /* don't use compat so we get predictable rotation */ @@ -2751,7 +2757,7 @@ static void rna_def_object(BlenderRNA *brna) prop = RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "index"); RNA_def_property_ui_text(prop, "Pass Index", "Index number for the \"Object Index\" render pass"); - RNA_def_property_update(prop, NC_OBJECT, "rna_Object_internal_update"); + RNA_def_property_update(prop, NC_OBJECT, "rna_Object_internal_update_draw"); prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "col"); |