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-12-16 03:59:02 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-12-16 03:59:02 +0400
commit862dc635ed98c6d1ffc7c755058c682021da4c6b (patch)
tree11de5533aaae2da3eab2ab63c5d5977aea73dbc4 /source/blender/blenloader
parentd0b70cffaf99321c57045d8dc8ec197b1542395c (diff)
parent0dbd9ea73f7f86e02d9aae6c65c3ce5e3c4ecd4b (diff)
svn merge ^/trunk/blender -r42617:42655
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b6e548eb69c..14decca5202 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8807,9 +8807,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
if(ob->soft && ob->soft->vertgroup==0) {
bDeformGroup *locGroup = defgroup_find_name(ob, "SOFTGOAL");
- if(locGroup){
+ if (locGroup) {
/* retrieve index for that group */
- ob->soft->vertgroup = 1 + defgroup_find_index(ob, locGroup);
+ ob->soft->vertgroup = 1 + BLI_findindex(&ob->defbase, locGroup);
}
}
}