Cycles: svn merge -r41467:41531 ^/trunk/blender
[blender.git] / source / blender / blenloader / intern / readfile.c
index 5c59ae20c7b7ca113feeef0278ce1ef3437f6576..c0d52747d568006de04e62aaa1fabe8d27cb2daa 100644 (file)
@@ -12286,8 +12286,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                ntree_tmp_cycles_emission_version_patch(fd, lib, ma->nodetree);
        }
 
-       /* put compatibility code here until next subversion bump */
-       {
+       if (main->versionfile < 260){
                {
                        /* set default alpha value of Image outputs in image and render layer nodes to 0 */
                        Scene *sce;
@@ -12320,6 +12319,31 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                                }
                        }
                }
+
+       }
+
+       if (main->versionfile < 260 || (main->versionfile == 260 && main->subversionfile < 1)){
+               Object *ob;
+
+               for (ob= main->object.first; ob; ob= ob->id.next) {
+                       ob->collision_boundtype= ob->boundtype;
+               }
+
+               {
+                       Camera *cam;
+                       for(cam= main->camera.first; cam; cam= cam->id.next) {
+                               if (cam->sensor_x < 0.01)
+                                       cam->sensor_x = DEFAULT_SENSOR_WIDTH;
+
+                               if (cam->sensor_y < 0.01)
+                                       cam->sensor_y = DEFAULT_SENSOR_HEIGHT;
+                       }
+               }
+       }
+
+       /* put compatibility code here until next subversion bump */
+       {
+               
        }
 
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */