svn merge -r 16060:16222 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / blenloader / intern / writefile.c
index f61c71f7f2f0a5922693e627ffd931d3940d832f..6bed9e0c4152ccb804897508e71fabc16dca5b2d 100644 (file)
@@ -535,6 +535,7 @@ static void write_particlesettings(WriteData *wd, ListBase *idbase)
                        writestruct(wd, ID_PA, "ParticleSettings", 1, part);
                        if (part->id.properties) IDP_WriteProperty(part->id.properties, wd);
                        writestruct(wd, DATA, "PartDeflect", 1, part->pd);
+                       writestruct(wd, DATA, "PartDeflect", 1, part->pd2);
                }
                part= part->id.next;
        }
@@ -608,6 +609,9 @@ static void write_sensors(WriteData *wd, ListBase *lb)
                case SENS_ACTUATOR:
                        writestruct(wd, DATA, "bActuatorSensor", 1, sens->data);
                        break;
+               case SENS_DELAY:
+                       writestruct(wd, DATA, "bDelaySensor", 1, sens->data);
+                       break;
                case SENS_COLLISION:
                        writestruct(wd, DATA, "bCollisionSensor", 1, sens->data);
                        break;