[Bf-blender-cvs] [8b716655e21] master: Cleanup: replace BKE_id_copy_ex by BKE_id_copy where possible.
Bastien Montagne
noreply at git.blender.org
Tue Feb 5 11:08:16 CET 2019
Commit: 8b716655e2152bb7558e00a5061f1381f9a9bd6e
Author: Bastien Montagne
Date: Mon Feb 4 20:38:01 2019 +0100
Branches: master
https://developer.blender.org/rB8b716655e2152bb7558e00a5061f1381f9a9bd6e
Cleanup: replace BKE_id_copy_ex by BKE_id_copy where possible.
That way it is obvious when we are using default ID copy behaviour, and
when we are using advanced/specialized ones.
===================================================================
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/cachefile.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lamp.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/lightprobe.c
M source/blender/blenkernel/intern/linestyle.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/movieclip.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenkernel/intern/speaker.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/texture.c
M source/blender/blenkernel/intern/world.c
===================================================================
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index c99a994cf06..313b589cf3a 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -163,7 +163,7 @@ void BKE_action_copy_data(Main *UNUSED(bmain), bAction *act_dst, const bAction *
bAction *BKE_action_copy(Main *bmain, const bAction *act_src)
{
bAction *act_copy;
- BKE_id_copy_ex(bmain, &act_src->id, (ID **)&act_copy, 0);
+ BKE_id_copy(bmain, &act_src->id, (ID **)&act_copy);
return act_copy;
}
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 81bf11e2cd7..6b11d146837 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -284,8 +284,8 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag)
/* make a copy of action - at worst, user has to delete copies... */
if (do_action) {
BLI_assert(bmain != NULL);
- BKE_id_copy_ex(bmain, (ID *)dadt->action, (ID **)&dadt->action, 0);
- BKE_id_copy_ex(bmain, (ID *)dadt->tmpact, (ID **)&dadt->tmpact, 0);
+ BKE_id_copy(bmain, (ID *)dadt->action, (ID **)&dadt->action);
+ BKE_id_copy(bmain, (ID *)dadt->tmpact, (ID **)&dadt->tmpact);
}
else if (do_id_user) {
id_us_plus((ID *)dadt->action);
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 6f9117db6ae..a475cd7a87b 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -201,7 +201,7 @@ void BKE_armature_copy_data(Main *UNUSED(bmain), bArmature *arm_dst, const bArma
bArmature *BKE_armature_copy(Main *bmain, const bArmature *arm)
{
bArmature *arm_copy;
- BKE_id_copy_ex(bmain, &arm->id, (ID **)&arm_copy, 0);
+ BKE_id_copy(bmain, &arm->id, (ID **)&arm_copy);
return arm_copy;
}
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 73f08446a2d..fe1db9b23ec 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -590,7 +590,7 @@ void BKE_brush_copy_data(Main *UNUSED(bmain), Brush *brush_dst, const Brush *bru
Brush *BKE_brush_copy(Main *bmain, const Brush *brush)
{
Brush *brush_copy;
- BKE_id_copy_ex(bmain, &brush->id, (ID **)&brush_copy, 0);
+ BKE_id_copy(bmain, &brush->id, (ID **)&brush_copy);
return brush_copy;
}
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index b7d9936a64a..afe38fbc105 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -126,7 +126,7 @@ void BKE_cachefile_copy_data(
CacheFile *BKE_cachefile_copy(Main *bmain, const CacheFile *cache_file)
{
CacheFile *cache_file_copy;
- BKE_id_copy_ex(bmain, &cache_file->id, (ID **)&cache_file_copy, 0);
+ BKE_id_copy(bmain, &cache_file->id, (ID **)&cache_file_copy);
return cache_file_copy;
}
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c
index 37620105edf..9371b295890 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -103,7 +103,7 @@ void BKE_camera_copy_data(Main *UNUSED(bmain), Camera *cam_dst, const Camera *ca
Camera *BKE_camera_copy(Main *bmain, const Camera *cam)
{
Camera *cam_copy;
- BKE_id_copy_ex(bmain, &cam->id, (ID **)&cam_copy, 0);
+ BKE_id_copy(bmain, &cam->id, (ID **)&cam_copy);
return cam_copy;
}
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 63fbdb09a23..575b8ee8333 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -224,7 +224,7 @@ Collection *BKE_collection_copy(Main *bmain, Collection *parent, Collection *col
}
Collection *collection_new;
- BKE_id_copy_ex(bmain, &collection->id, (ID **)&collection_new, 0);
+ BKE_id_copy(bmain, &collection->id, (ID **)&collection_new);
id_us_min(&collection_new->id); /* Copying add one user by default, need to get rid of that one. */
/* Optionally add to parent. */
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 946dc00974f..e7d56652bea 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -216,7 +216,7 @@ void BKE_curve_copy_data(Main *bmain, Curve *cu_dst, const Curve *cu_src, const
Curve *BKE_curve_copy(Main *bmain, const Curve *cu)
{
Curve *cu_copy;
- BKE_id_copy_ex(bmain, &cu->id, (ID **)&cu_copy, LIB_ID_COPY_SHAPEKEY);
+ BKE_id_copy(bmain, &cu->id, (ID **)&cu_copy);
return cu_copy;
}
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 2a2a83db524..b3453c529e9 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -637,7 +637,7 @@ void BKE_gpencil_copy_data(bGPdata *gpd_dst, const bGPdata *gpd_src, const int U
bGPdata *BKE_gpencil_copy(Main *bmain, const bGPdata *gpd)
{
bGPdata *gpd_copy;
- BKE_id_copy_ex(bmain, &gpd->id, (ID **)&gpd_copy, 0);
+ BKE_id_copy(bmain, &gpd->id, (ID **)&gpd_copy);
return gpd_copy;
}
@@ -662,7 +662,7 @@ bGPdata *BKE_gpencil_data_duplicate(Main *bmain, const bGPdata *gpd_src, bool in
}
else {
BLI_assert(bmain != NULL);
- BKE_id_copy_ex(bmain, &gpd_src->id, (ID **)&gpd_dst, 0);
+ BKE_id_copy(bmain, &gpd_src->id, (ID **)&gpd_dst);
}
/* Copy internal data (layers, etc.) */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 8896ee9ec3a..682c34b31b5 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -420,7 +420,7 @@ void BKE_image_copy_data(Main *UNUSED(bmain), Image *ima_dst, const Image *ima_s
Image *BKE_image_copy(Main *bmain, const Image *ima)
{
Image *ima_copy;
- BKE_id_copy_ex(bmain, &ima->id, (ID **)&ima_copy, 0);
+ BKE_id_copy(bmain, &ima->id, (ID **)&ima_copy);
return ima_copy;
}
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index c7df7b83f22..aaa78fc68e8 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -179,7 +179,7 @@ void BKE_key_copy_data(Main *UNUSED(bmain), Key *key_dst, const Key *key_src, co
Key *BKE_key_copy(Main *bmain, const Key *key)
{
Key *key_copy;
- BKE_id_copy_ex(bmain, &key->id, (ID **)&key_copy, 0);
+ BKE_id_copy(bmain, &key->id, (ID **)&key_copy);
return key_copy;
}
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c
index 2af362b1237..b4f40317f2a 100644
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@@ -124,7 +124,7 @@ void BKE_lamp_copy_data(Main *bmain, Lamp *la_dst, const Lamp *la_src, const int
Lamp *BKE_lamp_copy(Main *bmain, const Lamp *la)
{
Lamp *la_copy;
- BKE_id_copy_ex(bmain, &la->id, (ID **)&la_copy, 0);
+ BKE_id_copy(bmain, &la->id, (ID **)&la_copy);
return la_copy;
}
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 0c19cc277a2..52627bd8fb1 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -292,7 +292,7 @@ void BKE_lattice_copy_data(Main *bmain, Lattice *lt_dst, const Lattice *lt_src,
Lattice *BKE_lattice_copy(Main *bmain, const Lattice *lt)
{
Lattice *lt_copy;
- BKE_id_copy_ex(bmain, <->id, (ID **)<_copy, LIB_ID_COPY_SHAPEKEY);
+ BKE_id_copy(bmain, <->id, (ID **)<_copy);
return lt_copy;
}
diff --git a/source/blender/blenkernel/intern/lightprobe.c b/source/blender/blenkernel/intern/lightprobe.c
index d9f0f233c82..8a3fa19e14b 100644
--- a/source/blender/blenkernel/intern/lightprobe.c
+++ b/source/blender/blenkernel/intern/lightprobe.c
@@ -76,7 +76,7 @@ void BKE_lightprobe_copy_data(
LightProbe *BKE_lightprobe_copy(Main *bmain, const LightProbe *probe)
{
LightProbe *probe_copy;
- BKE_id_copy_ex(bmain, &probe->id, (ID **)&probe_copy, 0);
+ BKE_id_copy(bmain, &probe->id, (ID **)&probe_copy);
return probe_copy;
}
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index d304a0d602f..68682c53707 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -195,7 +195,7 @@ void BKE_linestyle_copy_data(
FreestyleLineStyle *BKE_linestyle_copy(struct Main *bmain, const FreestyleLineStyle *linestyle)
{
FreestyleLineStyle *linestyle_copy;
- BKE_id_copy_ex(bmain, &linestyle->id, (ID **)&linestyle_copy, 0);
+ BKE_id_copy(bmain, &linestyle->id, (ID **)&linestyle_copy);
return linestyle_copy;
}
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index 6da8b3572fa..4746592590d 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -863,7 +863,7 @@ void BKE_mask_copy_data(Main *UNUSED(bmain), Mask *mask_dst, const Mask *mask_sr
Mask *BKE_mask_copy(Main *bmain, const Mask *mask)
{
Mask *mask_copy;
- BKE_id_copy_ex(bmain, &mask->id, (ID **)&mask_copy, 0);
+ BKE_id_copy(bmain, &mask->id, (ID **)&mask_copy);
return mask_copy;
}
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index f22af2b4e20..7462b3eacbb 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -210,7 +210,7 @@ void BKE_material_copy_data(Main *bmain, Material *ma_dst, const Material *ma_sr
Material *BKE_material_copy(Main *bmain, const Material *ma)
{
Material *ma_copy;
- BKE_id_copy_ex(bmain, &ma->id, (ID **)&ma_copy, 0);
+ BKE_id_copy(bmain, &ma->id, (ID **)&ma_copy);
return ma_copy;
}
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 2188dde646c..049f4ca6212 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -116,7 +116,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list