Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-30 04:32:13 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-30 04:32:13 +0400
commit9b2df014d2ab714c4ff0ec9848f25a7db7f54142 (patch)
treea571e2a262f8d5ccbeb8b94fcc3d320c9dadb378 /source/blender/blenkernel/intern/particle.c
parentaff705c4305cf972992fd4750dccc8b7b4a343b8 (diff)
fix [#29459] Crash making a linked object group local
was an error with make-local refactor & path updating.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r--source/blender/blenkernel/intern/particle.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 7c71df9fece..0f2d14e3858 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3643,20 +3643,20 @@ void make_local_particlesettings(ParticleSettings *part)
expand_local_particlesettings(part);
}
else if(is_local && is_lib) {
- ParticleSettings *partn= psys_copy_settings(part);
+ ParticleSettings *part_new= psys_copy_settings(part);
- partn->id.us= 0;
+ part_new->id.us= 0;
/* Remap paths of new ID using old library as base. */
- BKE_id_lib_local_paths(bmain, &partn->id);
+ BKE_id_lib_local_paths(bmain, part->id.lib, &part_new->id);
/* do objects */
for(ob= bmain->object.first; ob; ob= ob->id.next) {
ParticleSystem *psys;
for(psys= ob->particlesystem.first; psys; psys=psys->next){
if(psys->part==part && ob->id.lib==0) {
- psys->part= partn;
- partn->id.us++;
+ psys->part= part_new;
+ part_new->id.us++;
part->id.us--;
}
}