Merged with r15628

2 files changed, 20 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 9b233ab56f5..e32063fd344 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7661,6 +7661,23 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		}
 	}
 
+	/* sun/sky */
+	if ((main->versionfile < 246) ){
+		Lamp *la;
+		for(la=main->lamp.first; la; la= la->id.next) {
+			la->sun_effect_type = 0;
+			la->horizon_brightness = 1.0;
+			la->spread = 1.0;
+			la->sun_brightness = 1.0;
+			la->sun_size = 1.0;
+			la->backscattered_light = 1.0;
+			la->atm_turbidity = 2.0;
+			la->atm_inscattering_factor = 1.0;
+			la->atm_extinction_factor = 1.0;
+			la->atm_distance_factor = 1.0;
+			la->sun_intensity = 1.0;
+		}
+	}
 
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index fd85560f72f..ee1e442119b 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -603,6 +603,9 @@ static void write_sensors(WriteData *wd, ListBase *lb)
 		case SENS_PROPERTY:
 			writestruct(wd, DATA, "bPropertySensor", 1, sens->data);
 			break;
+		case SENS_ACTUATOR:
+			writestruct(wd, DATA, "bActuatorSensor", 1, sens->data);
+			break;
 		case SENS_COLLISION:
 			writestruct(wd, DATA, "bCollisionSensor", 1, sens->data);
 			break;