Fix function declaration of some modifiers
Those functions did not use evaluation context. Also fixed lots of unused variables warnings caused by commented out code which needs to be ported away from DerivedMesh and to evaluation context.
This commit is contained in:
@@ -125,6 +125,8 @@ static void splineik_init_tree_from_pchan(Scene *scene, Object *UNUSED(ob), bPos
|
||||
return;
|
||||
}
|
||||
}
|
||||
#else
|
||||
(void) scene;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -862,6 +862,9 @@ static void rna_Object_particle_update(Main *UNUSED(bmain), Scene *scene, Pointe
|
||||
#if 0
|
||||
Object *ob = (Object *)ptr->id.data;
|
||||
PE_current_changed(NULL, scene, ob);
|
||||
#else
|
||||
(void) scene;
|
||||
(void) ptr;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
@@ -204,7 +204,9 @@ static DerivedMesh *applyModifier(ModifierData *md,
|
||||
|
||||
#else /* !WITH_MOD_REMESH */
|
||||
|
||||
static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob),
|
||||
static DerivedMesh *applyModifier(ModifierData *UNUSED(md),
|
||||
struct EvaluationContext *UNUSED(eval_ctx),
|
||||
Object *UNUSED(ob),
|
||||
DerivedMesh *derivedData,
|
||||
ModifierApplyFlag UNUSED(flag))
|
||||
{
|
||||
|
||||
@@ -164,7 +164,10 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams))
|
||||
return (wmd->defgrp_name[0] == '\0');
|
||||
}
|
||||
|
||||
static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *derivedData,
|
||||
static DerivedMesh *applyModifier(ModifierData *md,
|
||||
struct EvaluationContext *UNUSED(eval_ctx),
|
||||
Object *ob,
|
||||
DerivedMesh *derivedData,
|
||||
ModifierApplyFlag UNUSED(flag))
|
||||
{
|
||||
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *) md;
|
||||
|
||||
@@ -1035,6 +1035,8 @@ static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args, PyObject
|
||||
dm->release(dm);
|
||||
|
||||
Py_RETURN_NONE;
|
||||
#else
|
||||
UNUSED_VARS(self, args, kw);
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ static PyObject *pygpu_offscreen_unbind(BPy_GPUOffScreen *self, PyObject *args,
|
||||
/**
|
||||
* Use with PyArg_ParseTuple's "O&" formatting.
|
||||
*/
|
||||
static int pygpu_offscreen_check_matrix(PyObject *o, void *p)
|
||||
static int UNUSED_FUNCTION(pygpu_offscreen_check_matrix)(PyObject *o, void *p)
|
||||
{
|
||||
MatrixObject **pymat_p = p;
|
||||
MatrixObject *pymat = (MatrixObject *)o;
|
||||
@@ -246,6 +246,8 @@ static PyObject *pygpu_offscreen_draw_view3d(BPy_GPUOffScreen *self, PyObject *a
|
||||
MEM_freeN(rv3d_mats);
|
||||
|
||||
Py_RETURN_NONE;
|
||||
#else
|
||||
UNUSED_VARS(self, args, kwds);
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -1098,6 +1098,8 @@ static DerivedMesh *bvh_get_derived_mesh(
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
UNUSED_VARS(funcname, scene, ob, use_deform, use_render, use_cage);
|
||||
#endif
|
||||
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user