← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/sca.c
1
1
/**
2
 
 * $Id: sca.c 14444 2008-04-16 22:40:48Z hos $
 
2
 * $Id: sca.c 16136 2008-08-16 20:45:37Z ben2610 $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
150
150
        case SENS_PROPERTY:
151
151
                sens->data= MEM_callocN(sizeof(bPropertySensor), "propsens");
152
152
                break;
 
153
        case SENS_ACTUATOR:
 
154
                sens->data= MEM_callocN(sizeof(bActuatorSensor), "actsens");
 
155
                break;
 
156
        case SENS_DELAY:
 
157
                sens->data= MEM_callocN(sizeof(bDelaySensor), "delaysens");
 
158
                break;
153
159
        case SENS_MOUSE:
154
160
                ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens");
155
161
                ms->type= LEFTMOUSE;
411
417
        switch(act->type) {
412
418
#ifdef __NLA
413
419
        case ACT_ACTION:
 
420
        case ACT_SHAPEACTION:
414
421
                act->data= MEM_callocN(sizeof(bActionActuator), "actionact");
415
422
                break;
416
423
#endif
464
471
    case ACT_PARENT:
465
472
        act->data = MEM_callocN(sizeof( bParentActuator ), "parent act");
466
473
        break;
 
474
        case ACT_STATE:
 
475
        act->data = MEM_callocN(sizeof( bStateActuator ), "state act");
 
476
        break;
467
477
        default:
468
478
                ; /* this is very severe... I cannot make any memory for this        */
469
479
                /* logic brick...                                                    */