← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/gameengine/Expressions/InputParser.cpp

  • 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/gameengine/Expressions/InputParser.cpp
631
631
PyObject*       CParserPyMake(PyObject* ignored,PyObject* args)
632
632
{
633
633
        char* txt;
634
 
        Py_Try(PyArg_ParseTuple(args,"s",&txt));
 
634
        if (!PyArg_ParseTuple(args,"s",&txt))
 
635
                return NULL;
635
636
        CParser parser;
636
637
        CExpression* expr = parser.ProcessText(txt);
637
638
        CValue* val = expr->Calculate();
641
642
 
642
643
static PyMethodDef      CParserMethods[] = 
643
644
{
644
 
        { "calc", CParserPyMake , Py_NEWARGS},
 
645
        { "calc", CParserPyMake , METH_VARARGS},
645
646
        { NULL,NULL}    // Sentinel
646
647
};
647
648