Commit: 3b8e0606e1cfa484971d09c5060a78dbadbe1569
Author: Bastien Montagne
Date: Mon Jul 11 21:03:02 2016 +0200
Branches: master
https://developer.blender.org/rB3b8e0606e1cfa484971d09c5060a78dbadbe1569
Cleanup: remove call to BKE_id_lib_local_paths() in make_local functions.
This one is already called by matching copy functions, no need to call it twice!
===================================================================
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/armature.c
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/camera.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/lamp.c
M source/blender/blenkernel/intern/lattice.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/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/speaker.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 5712026..1e5ad81 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -120,9 +120,6 @@ void BKE_action_make_local(Main *bmain, bAction *act)
act_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, act->id.lib,
&act_new->id);
-
BKE_libblock_remap(bmain, act, act_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/armature.c
b/source/blender/blenkernel/intern/armature.c
index 3850e4b..47fa0e9 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -169,9 +169,6 @@ void BKE_armature_make_local(Main *bmain, bArmature *arm)
arm_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, arm->id.lib,
&arm_new->id);
-
BKE_libblock_remap(bmain, arm, arm_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/brush.c
b/source/blender/blenkernel/intern/brush.c
index 814934a..1f48d58 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -244,9 +244,6 @@ void BKE_brush_make_local(Main *bmain, Brush *brush)
brush_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, brush->id.lib,
&brush_new->id);
-
BKE_libblock_remap(bmain, brush, brush_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index 8ae714d..972057f 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -133,9 +133,6 @@ void BKE_camera_make_local(Main *bmain, Camera *cam)
cam_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, cam->id.lib,
&cam_new->id);
-
BKE_libblock_remap(bmain, cam, cam_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/curve.c
b/source/blender/blenkernel/intern/curve.c
index 4fb2cda..db5bbe3 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -235,9 +235,6 @@ void BKE_curve_make_local(Main *bmain, Curve *cu)
cu_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, cu->id.lib, &cu_new->id);
-
BKE_libblock_remap(bmain, cu, cu_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 4d50674..ae5c2b8 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -493,9 +493,6 @@ void BKE_image_make_local(Main *bmain, Image *ima)
ima_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, ima->id.lib,
&ima_new->id);
-
BKE_libblock_remap(bmain, ima, ima_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/lamp.c
b/source/blender/blenkernel/intern/lamp.c
index a26ada8..8486281 100644
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@@ -196,9 +196,6 @@ void BKE_lamp_make_local(Main *bmain, Lamp *la)
la_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, la->id.lib, &la_new->id);
-
BKE_libblock_remap(bmain, la, la_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/lattice.c
b/source/blender/blenkernel/intern/lattice.c
index 7ffec1e..c2a94ef 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -360,9 +360,6 @@ void BKE_lattice_make_local(Main *bmain, Lattice *lt)
lt_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, lt->id.lib, <_new->id);
-
BKE_libblock_remap(bmain, lt, lt_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/material.c
b/source/blender/blenkernel/intern/material.c
index 8658088..5583702 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -309,9 +309,6 @@ void BKE_material_make_local(Main *bmain, Material *ma)
ma_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, ma->id.lib, &ma_new->id);
-
BKE_libblock_remap(bmain, ma, ma_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/mball.c
b/source/blender/blenkernel/intern/mball.c
index e615c22..b65df04 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -149,9 +149,6 @@ void BKE_mball_make_local(Main *bmain, MetaBall *mb)
mb_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, mb->id.lib, &mb_new->id);
-
BKE_libblock_remap(bmain, mb, mb_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/mesh.c
b/source/blender/blenkernel/intern/mesh.c
index cfcc88e..66adea0 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -580,9 +580,6 @@ void BKE_mesh_make_local(Main *bmain, Mesh *me)
me_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, me->id.lib, &me_new->id);
-
BKE_libblock_remap(bmain, me, me_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/node.c
b/source/blender/blenkernel/intern/node.c
index 75c323a..a9c0e80 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1975,9 +1975,6 @@ void ntreeMakeLocal(Main *bmain, bNodeTree *ntree, bool
id_in_mainlist)
ntree_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, ntree->id.lib,
&ntree_new->id);
-
BKE_libblock_remap(bmain, ntree, ntree_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index ae09d8c..1d2f2ab 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1212,9 +1212,6 @@ void BKE_object_make_local(Main *bmain, Object *ob)
ob_new->id.us = 0;
ob_new->proxy = ob_new->proxy_from =
ob_new->proxy_group = NULL;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, ob->id.lib, &ob_new->id);
-
BKE_libblock_remap(bmain, ob, ob_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/particle.c
b/source/blender/blenkernel/intern/particle.c
index 8d42aae..f50f8cf 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3368,9 +3368,6 @@ void BKE_particlesettings_make_local(Main *bmain,
ParticleSettings *part)
part_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, part->id.lib,
&part_new->id);
-
BKE_libblock_remap(bmain, part, part_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/speaker.c
b/source/blender/blenkernel/intern/speaker.c
index 7a9fee9..8fb12d5 100644
--- a/source/blender/blenkernel/intern/speaker.c
+++ b/source/blender/blenkernel/intern/speaker.c
@@ -108,9 +108,6 @@ void BKE_speaker_make_local(Main *bmain, Speaker *spk)
spk_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, spk->id.lib,
&spk_new->id);
-
BKE_libblock_remap(bmain, spk, spk_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/texture.c
b/source/blender/blenkernel/intern/texture.c
index 6d44e4d..a5088e9 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -942,9 +942,6 @@ void BKE_texture_make_local(Main *bmain, Tex *tex)
tex_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, tex->id.lib,
&tex_new->id);
-
BKE_libblock_remap(bmain, tex, tex_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
diff --git a/source/blender/blenkernel/intern/world.c
b/source/blender/blenkernel/intern/world.c
index 8ca30af..ca9ff88 100644
--- a/source/blender/blenkernel/intern/world.c
+++ b/source/blender/blenkernel/intern/world.c
@@ -200,9 +200,6 @@ void BKE_world_make_local(Main *bmain, World *wrld)
wrld_new->id.us = 0;
- /* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, wrld->id.lib,
&wrld_new->id);
-
BKE_libblock_remap(bmain, wrld, wrld_new,
ID_REMAP_SKIP_INDIRECT_USAGE);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
