[Bf-blender-cvs] [9b784668aea] master: Cleanup: use proper enum type in parameter of BKE_scene_copy.

Bastien Montagne noreply at git.blender.org
Wed Jun 10 17:01:56 CEST 2020


Commit: 9b784668aea49d019040451618ca83fa3248b2e9
Author: Bastien Montagne
Date:   Wed Jun 10 17:01:15 2020 +0200
Branches: master
https://developer.blender.org/rB9b784668aea49d019040451618ca83fa3248b2e9

Cleanup: use proper enum type in parameter of BKE_scene_copy.

===================================================================

M	source/blender/blenkernel/BKE_scene.h
M	source/blender/blenkernel/intern/scene.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index dca6f569e25..9b048b1552a 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -108,7 +108,7 @@ struct Scene *BKE_scene_set_name(struct Main *bmain, const char *name);
 struct ToolSettings *BKE_toolsettings_copy(struct ToolSettings *toolsettings, const int flag);
 void BKE_toolsettings_free(struct ToolSettings *toolsettings);
 
-struct Scene *BKE_scene_copy(struct Main *bmain, struct Scene *sce, int type);
+struct Scene *BKE_scene_copy(struct Main *bmain, struct Scene *sce, eSceneCopyMethod type);
 void BKE_scene_groups_relink(struct Scene *sce);
 
 struct Scene *BKE_scene_find_from_collection(const struct Main *bmain,
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index aa2a1b14841..f6cbf831629 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -749,7 +749,7 @@ void BKE_scene_copy_data_eevee(Scene *sce_dst, const Scene *sce_src)
   /* TODO Copy the cache. */
 }
 
-Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
+Scene *BKE_scene_copy(Main *bmain, Scene *sce, eSceneCopyMethod type)
 {
   Scene *sce_copy;



More information about the Bf-blender-cvs mailing list