Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-06-14 23:39:33 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-06-14 23:39:33 +0300
commit7439919ac0c4b0146cfed0ddbb8b945fe3675bcb (patch)
tree39730e1c17f939bd12e465ce597e2f24bbd91d34 /source/blender/blenkernel/intern/mball.c
parentdbca1afefa700f25198761624cdb9f1fd21095d2 (diff)
parenteeb9e5316a615f0e5052b28eee4966c4e2ed1152 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/mball.c')
-rw-r--r--source/blender/blenkernel/intern/mball.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 4bfdb7fbc61..27e2b17b4e2 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -104,7 +104,7 @@ MetaBall *BKE_mball_add(Main *bmain, const char *name)
return mb;
}
-MetaBall *BKE_mball_copy(Main *bmain, MetaBall *mb)
+MetaBall *BKE_mball_copy(Main *bmain, const MetaBall *mb)
{
MetaBall *mbn;
int a;