formatting edits & remove debug print.

This commit is contained in:
2011-10-13 01:29:08 +00:00
parent 6955c47fac
commit 276e5f7095
28 changed files with 1331 additions and 1320 deletions

View File

@@ -72,10 +72,11 @@ void operator_wrapper(wmOperatorType *ot, void *userdata)
RNA_pointer_create(NULL, ot->srna, NULL, &ptr);
prop= RNA_struct_find_property(&ptr, "type");
if(prop)
if (prop) {
ot->prop= prop;
}
}
}
void macro_wrapper(wmOperatorType *ot, void *userdata)
{

View File

@@ -91,8 +91,9 @@ static PyObject *pyrna_prop_collection_values(BPy_PropertyRNA *self);
int pyrna_struct_validity_check(BPy_StructRNA *pysrna)
{
if(pysrna->ptr.type)
if (pysrna->ptr.type) {
return 0;
}
PyErr_Format(PyExc_ReferenceError,
"StructRNA of type %.200s has been removed",
Py_TYPE(pysrna)->tp_name);
@@ -101,8 +102,9 @@ int pyrna_struct_validity_check(BPy_StructRNA *pysrna)
int pyrna_prop_validity_check(BPy_PropertyRNA *self)
{
if(self->ptr.type)
if (self->ptr.type) {
return 0;
}
PyErr_Format(PyExc_ReferenceError,
"PropertyRNA of type %.200s.%.200s has been removed",
Py_TYPE(self)->tp_name, RNA_property_identifier(self->prop));
@@ -3132,10 +3134,11 @@ static void pyrna_dir_members_rna(PyObject *list, PointerRNA *ptr)
PyList_Append(list, pystring);
Py_DECREF(pystring);
if(name != nameptr)
if (name != nameptr) {
MEM_freeN(nameptr);
}
}
}
RNA_PROP_END;
}
}
@@ -3664,7 +3667,7 @@ static PyObject *pyrna_struct_get_id_data(BPy_DummyPointerRNA *self)
Py_RETURN_NONE;
}
static PyObject *pyrna_struct_get_pointer_data(BPy_DummyPointerRNA *self)
static PyObject *pyrna_struct_get_data(BPy_DummyPointerRNA *self)
{
return pyrna_struct_CreatePyObject(&self->ptr);
}
@@ -3684,7 +3687,7 @@ static PyObject *pyrna_struct_get_rna_type(BPy_PropertyRNA *self)
static PyGetSetDef pyrna_prop_getseters[]= {
{(char *)"id_data", (getter)pyrna_struct_get_id_data, (setter)NULL, (char *)"The :class:`bpy.types.ID` object this datablock is from or None, (not available for all data types)", NULL},
{(char *)"data", (getter)pyrna_struct_get_pointer_data, (setter)NULL, (char *)"The data this property is using, *type* :class:`bpy.types.bpy_struct`", NULL},
{(char *)"data", (getter)pyrna_struct_get_data, (setter)NULL, (char *)"The data this property is using, *type* :class:`bpy.types.bpy_struct`", NULL},
{(char *)"rna_type", (getter)pyrna_struct_get_rna_type, (setter)NULL, (char *)"The property type for introspection", NULL},
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
@@ -3720,10 +3723,11 @@ static PyObject *pyrna_prop_collection_keys(BPy_PropertyRNA *self)
Py_DECREF(item);
/* done */
if(name != nameptr)
if (name != nameptr) {
MEM_freeN(nameptr);
}
}
}
RNA_PROP_END;
return ret;
@@ -3822,9 +3826,10 @@ static PyObject *pyrna_struct_get(BPy_StructRNA *self, PyObject *args)
if (group) {
idprop= IDP_GetPropertyFromGroup(group, key);
if(idprop)
if (idprop) {
return BPy_IDGroup_WrapData(self->ptr.id.data, idprop);
}
}
return Py_INCREF(def), def;
}
@@ -6686,10 +6691,11 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param
/* only useful for single argument returns, we'll need another list loop for multiple */
if (flag & PROP_OUTPUT) {
err= pyrna_py_to_prop(&funcptr, parm, iter.data, PyTuple_GET_ITEM(ret, i++), "calling class function:");
if(err)
if (err) {
break;
}
}
}
RNA_parameter_list_end(&iter);
}

View File

@@ -659,9 +659,11 @@ int pyrna_array_contains_py(PointerRNA *ptr, PropertyRNA *prop, PyObject *value)
RNA_property_float_get_array(ptr, prop, tmp_arr);
for(i=0; i<len; i++)
if(tmp_arr[i] == value_f)
for (i=0; i<len; i++) {
if (tmp_arr[i] == value_f) {
break;
}
}
if (tmp_arr != tmp)
PyMem_FREE(tmp_arr);
@@ -694,9 +696,11 @@ int pyrna_array_contains_py(PointerRNA *ptr, PropertyRNA *prop, PyObject *value)
else
RNA_property_int_get_array(ptr, prop, tmp_arr);
for(i=0; i<len; i++)
if(tmp_arr[i] == value_i)
for (i=0; i<len; i++) {
if (tmp_arr[i] == value_i) {
break;
}
}
if (tmp_arr != tmp)
PyMem_FREE(tmp_arr);

View File

@@ -2235,7 +2235,7 @@ static int row_vector_multiplication(float rvec[MAX_DIMENSIONS], VectorObject *v
return -1;
memcpy(vec_cpy, vec->vec, vec_size * sizeof(float));
printf("asasas\n");
rvec[3] = 1.0f;
//muliplication
for (x = 0; x < mat->row_size; x++) {