← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/sca.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/sca.c
63
63
{
64
64
        bSensor *sens;
65
65
        
66
 
        while ((sens= lb->first)) {
67
 
                BLI_remlink(lb, sens);
 
66
        while ((sens = BLI_pophead(lb))) {
68
67
                free_sensor(sens);
69
68
        }
70
69
}
113
112
        case SENS_ALWAYS:
114
113
                sens->pulse = 0;
115
114
                break;
116
 
        case SENS_TOUCH:
117
 
                sens->data= MEM_callocN(sizeof(bTouchSensor), "touchsens");
118
 
                break;
119
115
        case SENS_NEAR:
120
116
                ns=sens->data= MEM_callocN(sizeof(bNearSensor), "nearsens");
121
117
                ns->dist= 1.0;
227
223
{
228
224
        bController *cont;
229
225
        
230
 
        while ((cont= lb->first)) {
231
 
                BLI_remlink(lb, cont);
232
 
                if (cont->slinks) MEM_freeN(cont->slinks);
 
226
        while ((cont = BLI_pophead(lb))) {
 
227
                if (cont->slinks)
 
228
                        MEM_freeN(cont->slinks);
233
229
                free_controller(cont);
234
230
        }
235
231
}
346
342
{
347
343
        bActuator *act;
348
344
        
349
 
        while ((act= lb->first)) {
350
 
                BLI_remlink(lb, act);
 
345
        while ((act = BLI_pophead(lb))) {
351
346
                free_actuator(act);
352
347
        }
353
348
}