diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-02 17:14:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-02 17:15:52 +0300 |
| commit | ce7575c823f169747af870058334395cc9bf7b10 (patch) | |
| tree | 54a53bddfe9edd7f6e0f89baffa68a2d396ae89c /source/blender/blenkernel/intern/library_override.c | |
| parent | 40771a0e9e0ce5797cb413840d958c879e677a62 (diff) | |
Static Override: Move 'auto' flag into override struct, expose it to RNA.
Diffstat (limited to 'source/blender/blenkernel/intern/library_override.c')
| -rw-r--r-- | source/blender/blenkernel/intern/library_override.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c index 8917fac198c..9f3cc578d2a 100644 --- a/source/blender/blenkernel/intern/library_override.c +++ b/source/blender/blenkernel/intern/library_override.c @@ -163,7 +163,7 @@ static ID *override_static_create_from(Main *bmain, ID *reference_id) id_us_min(local_id); BKE_override_static_init(local_id, reference_id); - local_id->flag |= LIB_OVERRIDE_STATIC_AUTO; + local_id->flag |= STATICOVERRIDE_AUTO; return local_id; } @@ -534,7 +534,7 @@ bool BKE_override_static_operations_create(ID *local, const bool force_auto) const bool is_template = (local->override_static->reference == NULL); bool ret = false; - if (!is_template && (force_auto || local->flag & LIB_OVERRIDE_STATIC_AUTO)) { + if (!is_template && (force_auto || local->override_static->flag & STATICOVERRIDE_AUTO)) { PointerRNA rnaptr_local, rnaptr_reference; RNA_id_pointer_create(local, &rnaptr_local); RNA_id_pointer_create(local->override_static->reference, &rnaptr_reference); |