[Bf-blender-cvs] [e08497e] hair_system: Fix for brackets lost in merge.
Lukas Tönne
noreply at git.blender.org
Sun Oct 5 14:56:59 CEST 2014
Commit: e08497e12c88282a3839e1f22b48b732a49cc849
Author: Lukas Tönne
Date: Sat Oct 4 11:49:32 2014 +0200
Branches: hair_system
https://developer.blender.org/rBe08497e12c88282a3839e1f22b48b732a49cc849
Fix for brackets lost in merge.
===================================================================
M source/blender/blenloader/intern/versioning_270.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index 98d1cd1..000155d 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -405,6 +405,8 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
Image *image;
for (image = main->image.first; image != NULL; image = image->id.next) {
image->gen_color[3] = 1.0f;
+ }
+ }
if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "int", "voxel_res")) {
Object *ob;
More information about the Bf-blender-cvs
mailing list