diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-04 16:03:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-04-04 16:03:55 +0300 |
| commit | 160e62b88cdcc927b7cb3741c7ea0565412e8016 (patch) | |
| tree | 3561447e02e088a056f85f10d13094a7fb49b9ca /source/blender/blenkernel/BKE_object.h | |
| parent | 59562e5b259ccc1e02e4f943394ca9db5ac938c7 (diff) | |
| parent | d59c2d12b1226afa3789b0ef142f8f6cc9356ead (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/BKE_object.h
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 11e259e0318..1af31d5e024 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -77,7 +77,7 @@ bool BKE_object_support_modifier_type_check(struct Object *ob, int modifier_type void BKE_object_link_modifiers( struct Object *ob_dst, const struct Object *ob_src, eObjectMode object_mode); -void BKE_object_free_modifiers(struct Object *ob); +void BKE_object_free_modifiers(struct Object *ob, const int flag); void BKE_object_make_proxy(struct Object *ob, struct Object *target, struct Object *gob); void BKE_object_copy_proxy_drivers(struct Object *ob, struct Object *target); |