diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 21:48:22 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 21:48:22 +0300 |
commit | e673c9dc938844d158abe543457aca8016ef8bc1 (patch) | |
tree | f07f233140366557f48c3969e05c21c8a0be9764 /source/blender/blenkernel/BKE_lightprobe.h | |
parent | 41830cc432b9726cb64bc396af4dafbf591c17be (diff) |
Merge again...
Diffstat (limited to 'source/blender/blenkernel/BKE_lightprobe.h')
-rw-r--r-- | source/blender/blenkernel/BKE_lightprobe.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_lightprobe.h b/source/blender/blenkernel/BKE_lightprobe.h index ae7df75345d..a769b6653d7 100644 --- a/source/blender/blenkernel/BKE_lightprobe.h +++ b/source/blender/blenkernel/BKE_lightprobe.h @@ -38,7 +38,8 @@ struct LightProbe; void BKE_lightprobe_init(struct LightProbe *probe); void *BKE_lightprobe_add(struct Main *bmain, const char *name); -struct LightProbe *BKE_lightprobe_copy(struct Main *bmain, struct LightProbe *probe); +void BKE_lightprobe_copy_data(struct Main *bmain, struct LightProbe *probe_dst, const struct LightProbe *probe_src, const int flag); +struct LightProbe *BKE_lightprobe_copy(struct Main *bmain, const struct LightProbe *probe); void BKE_lightprobe_make_local(struct Main *bmain, struct LightProbe *probe, const bool lib_local); void BKE_lightprobe_free(struct LightProbe *probe); |