diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-06-14 23:39:33 +0300 |
| commit | 7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch) | |
| tree | 39730e1c17f939bd12e465ce597e2f24bbd91d34 /source/blender/blenkernel/BKE_object.h | |
| parent | dbca1afefa700f25198761624cdb9f1fd21095d2 (diff) | |
| parent | eeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_object.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_object.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h index 6bc2706c685..2aa7829c9df 100644 --- a/source/blender/blenkernel/BKE_object.h +++ b/source/blender/blenkernel/BKE_object.h @@ -55,7 +55,7 @@ void BKE_object_workob_calc_parent(struct Scene *scene, struct Object *ob, struc void BKE_object_transform_copy(struct Object *ob_tar, const struct Object *ob_src); struct SoftBody *copy_softbody(const struct SoftBody *sb, bool copy_caches); -struct BulletSoftBody *copy_bulletsoftbody(struct BulletSoftBody *sb); +struct BulletSoftBody *copy_bulletsoftbody(const struct BulletSoftBody *sb); struct ParticleSystem *BKE_object_copy_particlesystem(struct ParticleSystem *psys); void BKE_object_copy_particlesystems(struct Object *ob_dst, const struct Object *ob_src); void BKE_object_copy_softbody(struct Object *ob_dst, const struct Object *ob_src); @@ -106,8 +106,8 @@ bool BKE_object_lod_is_usable(struct Object *ob, struct SceneLayer *sl); struct Object *BKE_object_lod_meshob_get(struct Object *ob, struct SceneLayer *sl); struct Object *BKE_object_lod_matob_get(struct Object *ob, struct SceneLayer *sl); -struct Object *BKE_object_copy_ex(struct Main *bmain, struct Object *ob, bool copy_caches); -struct Object *BKE_object_copy(struct Main *bmain, struct Object *ob); +struct Object *BKE_object_copy_ex(struct Main *bmain, const struct Object *ob, bool copy_caches); +struct Object *BKE_object_copy(struct Main *bmain, const struct Object *ob); void BKE_object_make_local(struct Main *bmain, struct Object *ob, const bool lib_local); void BKE_object_make_local_ex(struct Main *bmain, struct Object *ob, const bool lib_local, const bool clear_proxy); bool BKE_object_is_libdata(struct Object *ob); |