diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-17 14:59:59 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-17 15:27:13 +0300 |
commit | 34d67601b716046cf15f3e808a92bc91d0af804f (patch) | |
tree | a6875fadf1c129513a889cba61c6627d1a76e45b /source/blender/makesrna/intern/rna_modifier.c | |
parent | 8b5816e76bbf18246a5e28ec64a8e4c035f15e7a (diff) |
Python: Raise an error even NO_MAIN data is assigned to object
The goal is to prevent assignment of temporary or evaluated meshes
to objects from the main database.
Majority of the change is actually related on passing reports around.
On a positive side there are more error prints which can become more
visible to scripters.
There are still possible further improvements in the related areas.
For example, disable user counting for evaluated ID datablocks when
assignment happens. But can also happen later on as a separate
improvement.
Reviewers: brecht, campbellbarton, mont29
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D4884
Diffstat (limited to 'source/blender/makesrna/intern/rna_modifier.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index a3abf0237c8..28d02c6de00 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -719,7 +719,8 @@ static void modifier_object_set(Object *self, Object **ob_p, int type, PointerRN } # define RNA_MOD_OBJECT_SET(_type, _prop, _obtype) \ - static void rna_##_type##Modifier_##_prop##_set(PointerRNA *ptr, PointerRNA value) \ + static void rna_##_type##Modifier_##_prop##_set( \ + struct ReportList *UNUSED(reports), PointerRNA *ptr, PointerRNA value) \ { \ _type##ModifierData *tmd = (_type##ModifierData *)ptr->data; \ modifier_object_set(ptr->id.data, &tmd->_prop, _obtype, value); \ @@ -741,7 +742,9 @@ RNA_MOD_OBJECT_SET(Shrinkwrap, target, OB_MESH); RNA_MOD_OBJECT_SET(Shrinkwrap, auxTarget, OB_MESH); RNA_MOD_OBJECT_SET(SurfaceDeform, target, OB_MESH); -static void rna_HookModifier_object_set(PointerRNA *ptr, PointerRNA value) +static void rna_HookModifier_object_set(struct ReportList *UNUSED(reports), + PointerRNA *ptr, + PointerRNA value) { Object *owner = (Object *)ptr->id.data; HookModifierData *hmd = ptr->data; @@ -824,7 +827,9 @@ static PointerRNA rna_UVProjector_object_get(PointerRNA *ptr) return rna_pointer_inherit_refine(ptr, &RNA_Object, *ob); } -static void rna_UVProjector_object_set(PointerRNA *ptr, PointerRNA value) +static void rna_UVProjector_object_set(struct ReportList *UNUSED(reports), + PointerRNA *ptr, + PointerRNA value) { Object **ob_p = (Object **)ptr->data; Object *ob = (Object *)value.data; @@ -1396,7 +1401,8 @@ static PointerRNA rna_ParticleInstanceModifier_particle_system_get(PointerRNA *p return rptr; } -static void rna_ParticleInstanceModifier_particle_system_set(PointerRNA *ptr, +static void rna_ParticleInstanceModifier_particle_system_set(struct ReportList *UNUSED(reports), + PointerRNA *ptr, const PointerRNA value) { ParticleInstanceModifierData *psmd = ptr->data; |