From e673c9dc938844d158abe543457aca8016ef8bc1 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 7 Aug 2017 20:48:22 +0200 Subject: Merge again... --- source/blender/blenkernel/BKE_lightprobe.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_lightprobe.h') 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); -- cgit v1.2.3