archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Bastien Montagne
2017-06-14 22:39:33 +02:00
parent dbca1afefa eeb9e5316a
commit 7439919ac0
80 changed files with 193 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/object.c
View File

@@ -909,7 +909,7 @@ SoftBody *copy_softbody(const SoftBody *sb, bool copy_caches)
return sbn;
}
BulletSoftBody *copy_bulletsoftbody(BulletSoftBody *bsb)
BulletSoftBody *copy_bulletsoftbody(const BulletSoftBody *bsb)
{
BulletSoftBody *bsbn;
@@ -1042,7 +1042,7 @@ void BKE_object_copy_softbody(Object *ob_dst, const Object *ob_src)
}
}
static void copy_object_pose(Object *obn, Object *ob)
static void copy_object_pose(Object *obn, const Object *ob)
{
bPoseChannel *chan;
@@ -1075,7 +1075,7 @@ static void copy_object_pose(Object *obn, Object *ob)
}
}
static void copy_object_lod(Object *obn, Object *ob)
static void copy_object_lod(Object *obn, const Object *ob)
{
BLI_duplicatelist(&obn->lodlevels, &ob->lodlevels);
@@ -1126,7 +1126,7 @@ void BKE_object_transform_copy(Object *ob_tar, const Object *ob_src)
copy_v3_v3(ob_tar->size, ob_src->size);
}
Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches)
Object *BKE_object_copy_ex(Main *bmain, const Object *ob, bool copy_caches)
{
Object *obn;
ModifierData *md;
@@ -1217,7 +1217,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches)
}
/* copy objects, will re-initialize cached simulation data */
Object *BKE_object_copy(Main *bmain, Object *ob)
Object *BKE_object_copy(Main *bmain, const Object *ob)
{
return BKE_object_copy_ex(bmain, ob, false);
}