ObjectGadget.cpp (pymol-open-source-2.2.0) | : | ObjectGadget.cpp (pymol-open-source-2.3.0) | ||
---|---|---|---|---|
skipping to change at line 298 | skipping to change at line 298 | |||
} | } | |||
} | } | |||
} | } | |||
return (ok); | return (ok); | |||
} | } | |||
int ObjectGadgetInitFromPyList(PyMOLGlobals * G, PyObject * list, ObjectGadget * I, | int ObjectGadgetInitFromPyList(PyMOLGlobals * G, PyObject * list, ObjectGadget * I, | |||
int version) | int version) | |||
{ | { | |||
int ok = true; | int ok = true; | |||
int ll; | ||||
if(ok) | if(ok) | |||
ok = (I != NULL) && (list != NULL); | ok = (I != NULL) && (list != NULL); | |||
if(ok) | if(ok) | |||
ok = PyList_Check(list); | ok = PyList_Check(list); | |||
if(ok) | ||||
ll = PyList_Size(list); | ||||
/* TO SUPPORT BACKWARDS COMPATIBILITY... | /* TO SUPPORT BACKWARDS COMPATIBILITY... | |||
Always check ll when adding new PyList_GetItem's */ | Always check ll when adding new PyList_GetItem's */ | |||
if(ok) | if(ok) | |||
ok = ObjectFromPyList(G, PyList_GetItem(list, 0), &I->Obj); | ok = ObjectFromPyList(G, PyList_GetItem(list, 0), &I->Obj); | |||
if(ok) | if(ok) | |||
ok = PConvPyIntToInt(PyList_GetItem(list, 1), &I->GadgetType); | ok = PConvPyIntToInt(PyList_GetItem(list, 1), &I->GadgetType); | |||
if(ok) | if(ok) | |||
ok = PConvPyIntToInt(PyList_GetItem(list, 2), &I->NGSet); | ok = PConvPyIntToInt(PyList_GetItem(list, 2), &I->NGSet); | |||
if(ok) | if(ok) | |||
ok = ObjectGadgetGSetFromPyList(I, PyList_GetItem(list, 3), version); | ok = ObjectGadgetGSetFromPyList(I, PyList_GetItem(list, 3), version); | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 0 lines changed or added |