← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/KX_ConvertActuators.cpp

  • 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/gameengine/Converter/KX_ConvertActuators.cpp
120
120
                         KX_KetsjiEngine* ketsjiEngine,
121
121
                         int activeLayerBitInfo,
122
122
                         bool isInActiveLayer,
123
 
                         RAS_IRenderTools* rendertools,
124
123
                         KX_BlenderSceneConverter* converter
125
124
                         )
126
125
{
206
205
                case ACT_ACTION:
207
206
                        {
208
207
                                bActionActuator* actact = (bActionActuator*) bact->data;
209
 
                                STR_String propname = (actact->name ? actact->name : "");
210
 
                                STR_String propframe = (actact->frameProp ? actact->frameProp : "");
 
208
                                STR_String propname = actact->name;
 
209
                                STR_String propframe = actact->frameProp;
211
210
 
212
211
                                short ipo_flags = 0;
213
212
 
225
224
                                            actact->end,
226
225
                                            actact->act,
227
226
                                            actact->type, // + 1, because Blender starts to count at zero,
 
227
                                            actact->blend_mode,
228
228
                                            actact->blendin,
229
229
                                            actact->priority,
230
230
                                            actact->layer,
241
241
                        {
242
242
                                if (blenderobject->type==OB_MESH) {
243
243
                                        bActionActuator* actact = (bActionActuator*) bact->data;
244
 
                                        STR_String propname = (actact->name ? actact->name : "");
245
 
                                        STR_String propframe = (actact->frameProp ? actact->frameProp : "");
 
244
                                        STR_String propname = actact->name;
 
245
                                        STR_String propframe = actact->frameProp;
246
246
                                        
247
247
                                        BL_ShapeActionActuator* tmpbaseact = new BL_ShapeActionActuator(
248
248
                                                    gameobj,
319
319
                                /* Get the name of the properties that objects must own that
320
320
                                 * we're sending to, if present
321
321
                                 */
322
 
                                STR_String toPropName = (msgAct->toPropName
323
 
                                        ? (char*) msgAct->toPropName
324
 
                                        : "");
 
322
                                STR_String toPropName = msgAct->toPropName;
325
323
                                
326
324
                                /* Get the Message Subject to send.
327
325
                                 */
328
 
                                STR_String subject = (msgAct->subject
329
 
                                        ? (char*) msgAct->subject
330
 
                                        : "");
 
326
                                STR_String subject = msgAct->subject;
331
327
                                
332
328
                                /* Get the bodyType
333
329
                                 */
334
330
                                int bodyType = msgAct->bodyType;
335
 
                                
 
331
 
336
332
                                /* Get the body (text message or property name whose value
337
333
                                 * we'll be sending, might be empty
338
334
                                 */
339
 
                                STR_String body = (msgAct->body
340
 
                                        ? (char*) msgAct->body
341
 
                                        : "");
 
335
                                const STR_String body = msgAct->body;
342
336
                                
343
337
                                KX_NetworkMessageActuator *tmpmsgact = new KX_NetworkMessageActuator(
344
338
                                            gameobj,                                    // actuator controlling object
754
748
                                                        break;
755
749
                                                };
756
750
                                                
757
 
                                                if (sceneact->scene)
758
 
                                                {
759
 
                                                        nextSceneName = sceneact->scene->id.name + 2; // this '2' is necessary to remove prefix 'SC'
 
751
                                                if (sceneact->scene) {
 
752
                                                        nextSceneName = sceneact->scene->id.name + 2;
760
753
                                                }
761
754
                                                
762
755
                                                break;