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:
authorMitchell Stokes <mogurijin@gmail.com>2012-11-04 04:37:45 +0400
committerMitchell Stokes <mogurijin@gmail.com>2012-11-04 04:37:45 +0400
commit4fe8e5e364a318e54a7e5f89f3ef943706292348 (patch)
tree83ebe568bd6f5acde75f412c6f0be631d19f1bfd /source/blender/blenloader
parent84e8fbc1e005a1e6c93202ef21b62d7e9dc66e17 (diff)
Ton's last do_versions commit got rid of do_versions code for collision masks. Adding it back in so collision in the BGE work again.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index a6e95541d9c..44561e7c055 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8299,6 +8299,16 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
}
}
+
+ {
+ Object *ob;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ if (ob->col_group == 0) {
+ ob->col_group = 0x01;
+ ob->col_mask = 0xff;
+ }
+ }
+ }
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */