style cleanup: function definitions
This commit is contained in:
parent
c0bd076bfd
commit
5fe5a8c283
|
@ -718,7 +718,8 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
|
|||
dag_add_relation(dag, scenenode, node, DAG_RL_SCENE, "Scene Relation");
|
||||
}
|
||||
|
||||
struct DagForest *build_dag(Main *bmain, Scene *sce, short mask){
|
||||
DagForest *build_dag(Main *bmain, Scene *sce, short mask)
|
||||
{
|
||||
Base *base;
|
||||
Object *ob;
|
||||
Group *group;
|
||||
|
@ -1458,7 +1459,8 @@ int pre_and_post_source_DFS(DagForest *dag, short mask, DagNode *source, graph_a
|
|||
|
||||
|
||||
// used to get the obs owning a datablock
|
||||
struct DagNodeQueue *get_obparents(struct DagForest *dag, void *ob){
|
||||
DagNodeQueue *get_obparents(struct DagForest *dag, void *ob)
|
||||
{
|
||||
DagNode *node, *node1;
|
||||
DagNodeQueue *nqueue;
|
||||
DagAdjList *itA;
|
||||
|
@ -1491,7 +1493,8 @@ struct DagNodeQueue *get_obparents(struct DagForest *dag, void *ob){
|
|||
return nqueue;
|
||||
}
|
||||
|
||||
struct DagNodeQueue *get_first_ancestors(struct DagForest *dag, void *ob){
|
||||
DagNodeQueue *get_first_ancestors(struct DagForest *dag, void *ob)
|
||||
{
|
||||
DagNode *node, *node1;
|
||||
DagNodeQueue *nqueue;
|
||||
DagAdjList *itA;
|
||||
|
@ -1519,7 +1522,8 @@ struct DagNodeQueue *get_first_ancestors(struct DagForest *dag, void *ob){
|
|||
}
|
||||
|
||||
// standard DFS list
|
||||
struct DagNodeQueue *get_all_childs(struct DagForest *dag, void *ob){
|
||||
DagNodeQueue *get_all_childs(struct DagForest *dag, void *ob)
|
||||
{
|
||||
DagNode *node;
|
||||
DagNodeQueue *nqueue;
|
||||
DagNodeQueue *retqueue;
|
||||
|
|
|
@ -259,7 +259,8 @@ int dynamicPaint_surfaceHasColorPreview(DynamicPaintSurface *surface)
|
|||
}
|
||||
|
||||
/* get currently active surface (in user interface) */
|
||||
struct DynamicPaintSurface *get_activeSurface(DynamicPaintCanvasSettings *canvas){
|
||||
DynamicPaintSurface *get_activeSurface(DynamicPaintCanvasSettings *canvas)
|
||||
{
|
||||
DynamicPaintSurface *surface = canvas->surfaces.first;
|
||||
int i;
|
||||
|
||||
|
@ -993,7 +994,8 @@ void dynamicPaint_Modifier_free(struct DynamicPaintModifierData *pmd)
|
|||
* If scene is null, frame range of 1-250 is used
|
||||
* A pointer to this surface is returned
|
||||
*/
|
||||
struct DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *canvas, Scene *scene){
|
||||
DynamicPaintSurface *dynamicPaint_createNewSurface(DynamicPaintCanvasSettings *canvas, Scene *scene)
|
||||
{
|
||||
DynamicPaintSurface *surface = MEM_callocN(sizeof(DynamicPaintSurface), "DynamicPaintSurface");
|
||||
if (!surface) return NULL;
|
||||
|
||||
|
@ -1594,9 +1596,10 @@ static void dynamicPaint_applySurfaceDisplace(DynamicPaintSurface *surface, Deri
|
|||
/*
|
||||
* Apply canvas data to the object derived mesh
|
||||
*/
|
||||
static struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd,
|
||||
Object *ob,
|
||||
DerivedMesh *dm){
|
||||
struct DerivedMesh *dynamicPaint_Modifier_apply(DynamicPaintModifierData *pmd,
|
||||
Object *ob,
|
||||
DerivedMesh *dm)
|
||||
{
|
||||
DerivedMesh *result = CDDM_copy(dm);
|
||||
|
||||
if (pmd->canvas && !(pmd->canvas->flags & MOD_DPAINT_BAKING)) {
|
||||
|
@ -1901,7 +1904,8 @@ static void dynamicPaint_frameUpdate(DynamicPaintModifierData *pmd, Scene *scene
|
|||
}
|
||||
|
||||
/* Modifier call. Processes dynamic paint modifier step. */
|
||||
struct DerivedMesh *dynamicPaint_Modifier_do(DynamicPaintModifierData *pmd, Scene *scene, Object *ob, DerivedMesh *dm){
|
||||
DerivedMesh *dynamicPaint_Modifier_do(DynamicPaintModifierData *pmd, Scene *scene, Object *ob, DerivedMesh *dm)
|
||||
{
|
||||
/* For now generate tessfaces in every case
|
||||
* XXX - move/remove when most of dpaint functions are converted to use bmesh types */
|
||||
DM_ensure_tessface(dm);
|
||||
|
|
|
@ -520,7 +520,8 @@ static float char_width(Curve *cu, VChar *che, CharInfo *info)
|
|||
}
|
||||
}
|
||||
|
||||
struct chartrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int mode){
|
||||
struct chartrans *BKE_vfont_to_curve(Main *bmain, Scene *scene, Object *ob, int mode)
|
||||
{
|
||||
VFont *vfont, *oldvfont;
|
||||
VFontData *vfd = NULL;
|
||||
Curve *cu;
|
||||
|
|
|
@ -1743,7 +1743,8 @@ void BKE_makepicstring(char *string, const char *base, const char *relbase, int
|
|||
}
|
||||
|
||||
/* used by sequencer too */
|
||||
struct anim *openanim(const char *name, int flags, int streamindex){
|
||||
struct anim *openanim(const char *name, int flags, int streamindex)
|
||||
{
|
||||
struct anim *anim;
|
||||
struct ImBuf *ibuf;
|
||||
|
||||
|
|
|
@ -735,7 +735,8 @@ static void set_height_normalize_factor(struct Ocean *oc)
|
|||
oc->normalize_factor = res;
|
||||
}
|
||||
|
||||
struct Ocean *BKE_add_ocean(void){
|
||||
struct Ocean *BKE_add_ocean(void)
|
||||
{
|
||||
Ocean *oc = MEM_callocN(sizeof(Ocean), "ocean sim data");
|
||||
|
||||
BLI_rw_mutex_init(&oc->oceanmutex);
|
||||
|
@ -1079,7 +1080,8 @@ void BKE_ocean_cache_eval_ij(struct OceanCache *och, struct OceanResult *ocr, in
|
|||
|
||||
struct OceanCache *BKE_init_ocean_cache(const char *bakepath, const char *relbase,
|
||||
int start, int end, float wave_scale,
|
||||
float chop_amount, float foam_coverage, float foam_fade, int resolution){
|
||||
float chop_amount, float foam_coverage, float foam_fade, int resolution)
|
||||
{
|
||||
OceanCache *och = MEM_callocN(sizeof(OceanCache), "ocean cache data");
|
||||
|
||||
och->bakepath = bakepath;
|
||||
|
@ -1360,9 +1362,10 @@ void BKE_ocean_cache_eval_ij(struct OceanCache *UNUSED(och), struct OceanResult
|
|||
{
|
||||
}
|
||||
|
||||
struct OceanCache *BKE_init_ocean_cache(const char *UNUSED(bakepath), const char *UNUSED(relbase),
|
||||
OceanCache *BKE_init_ocean_cache(const char *UNUSED(bakepath), const char *UNUSED(relbase),
|
||||
int UNUSED(start), int UNUSED(end), float UNUSED(wave_scale),
|
||||
float UNUSED(chop_amount), float UNUSED(foam_coverage), float UNUSED(foam_fade), int UNUSED(resolution)){
|
||||
float UNUSED(chop_amount), float UNUSED(foam_coverage), float UNUSED(foam_fade), int UNUSED(resolution))
|
||||
{
|
||||
OceanCache *och = MEM_callocN(sizeof(OceanCache), "ocean cache data");
|
||||
|
||||
return och;
|
||||
|
|
|
@ -74,10 +74,11 @@ enum {
|
|||
GlowA = 3
|
||||
};
|
||||
|
||||
static struct ImBuf *prepare_effect_imbufs(
|
||||
SeqRenderData context,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *prepare_effect_imbufs(
|
||||
SeqRenderData context,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out;
|
||||
int x = context.rectx;
|
||||
int y = context.recty;
|
||||
|
@ -282,7 +283,7 @@ static ImBuf *IMB_cast_away_list(ImBuf *i)
|
|||
return (ImBuf *) (((void **) i) + 2);
|
||||
}
|
||||
|
||||
static struct ImBuf *do_plugin_effect(
|
||||
static ImBuf *do_plugin_effect(
|
||||
SeqRenderData context, Sequence *seq, float cfra,
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
|
@ -541,7 +542,7 @@ static void do_alphaover_effect_float(float facf0, float facf1, int x, int y,
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_alphaover_effect(
|
||||
static ImBuf *do_alphaover_effect(
|
||||
SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
|
@ -719,7 +720,7 @@ static void do_alphaunder_effect_float(float facf0, float facf1, int x, int y,
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_alphaunder_effect(
|
||||
static ImBuf *do_alphaunder_effect(
|
||||
SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
|
@ -845,7 +846,7 @@ static void do_cross_effect_float(float facf0, float facf1, int x, int y,
|
|||
|
||||
/* careful: also used by speed effect! */
|
||||
|
||||
static struct ImBuf *do_cross_effect(
|
||||
static ImBuf *do_cross_effect(
|
||||
SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
|
@ -1111,7 +1112,7 @@ static void do_gammacross_effect_float(float facf0, float UNUSED(facf1),
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_gammacross_effect(
|
||||
static ImBuf *do_gammacross_effect(
|
||||
SeqRenderData context,
|
||||
Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
|
@ -1231,11 +1232,12 @@ static void do_add_effect_float(float facf0, float facf1, int x, int y,
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_add_effect(SeqRenderData context,
|
||||
Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *do_add_effect(SeqRenderData context,
|
||||
Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
|
||||
if (out->rect_float) {
|
||||
|
@ -1347,11 +1349,12 @@ static void do_sub_effect_float(float facf0, float facf1, int x, int y,
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_sub_effect(
|
||||
SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *do_sub_effect(
|
||||
SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
|
||||
if (out->rect_float) {
|
||||
|
@ -1560,7 +1563,7 @@ static void do_mul_effect_float(float facf0, float facf1, int x, int y,
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_mul_effect(
|
||||
static ImBuf *do_mul_effect(
|
||||
SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
|
@ -2008,11 +2011,12 @@ static void do_wipe_effect_float(Sequence *seq, float facf0, float UNUSED(facf1)
|
|||
}
|
||||
}
|
||||
|
||||
static struct ImBuf *do_wipe_effect(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *do_wipe_effect(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
|
||||
if (out->rect_float) {
|
||||
|
@ -2155,11 +2159,12 @@ static void do_transform(Scene *scene, Sequence *seq, float UNUSED(facf0), int x
|
|||
}
|
||||
|
||||
|
||||
static struct ImBuf *do_transform_effect(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float UNUSED(facf1),
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *do_transform_effect(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float UNUSED(facf1),
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
|
||||
do_transform(context.scene, seq, facf0,
|
||||
|
@ -2671,7 +2676,7 @@ static void do_glow_effect_float(Sequence *seq, int render_size, float facf0, fl
|
|||
RVAddBitmaps_float(inbuf, outbuf, outbuf, x, y);
|
||||
}
|
||||
|
||||
static struct ImBuf *do_glow_effect(
|
||||
static ImBuf *do_glow_effect(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
|
@ -2736,11 +2741,12 @@ static int early_out_color(struct Sequence *UNUSED(seq),
|
|||
return -1;
|
||||
}
|
||||
|
||||
static struct ImBuf *do_solid_color(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *do_solid_color(
|
||||
SeqRenderData context, Sequence *seq, float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1, struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
|
||||
SolidColorVars *cv = (SolidColorVars *)seq->effectdata;
|
||||
|
@ -2833,11 +2839,12 @@ static int early_out_multicam(struct Sequence *UNUSED(seq), float UNUSED(facf0),
|
|||
return -1;
|
||||
}
|
||||
|
||||
static struct ImBuf *do_multicam(
|
||||
SeqRenderData context, Sequence *seq, float cfra,
|
||||
float UNUSED(facf0), float UNUSED(facf1),
|
||||
struct ImBuf *UNUSED(ibuf1), struct ImBuf *UNUSED(ibuf2),
|
||||
struct ImBuf *UNUSED(ibuf3)){
|
||||
static ImBuf *do_multicam(
|
||||
SeqRenderData context, Sequence *seq, float cfra,
|
||||
float UNUSED(facf0), float UNUSED(facf1),
|
||||
struct ImBuf *UNUSED(ibuf1), struct ImBuf *UNUSED(ibuf2),
|
||||
struct ImBuf *UNUSED(ibuf3))
|
||||
{
|
||||
struct ImBuf *i;
|
||||
struct ImBuf *out;
|
||||
Editing *ed;
|
||||
|
@ -2887,8 +2894,8 @@ static int early_out_adjustment(struct Sequence *UNUSED(seq), float UNUSED(facf0
|
|||
return -1;
|
||||
}
|
||||
|
||||
static struct ImBuf *do_adjustment_impl(SeqRenderData context, Sequence *seq,
|
||||
float cfra){
|
||||
static ImBuf *do_adjustment_impl(SeqRenderData context, Sequence *seq, float cfra)
|
||||
{
|
||||
Editing *ed;
|
||||
ListBase *seqbasep;
|
||||
struct ImBuf *i = NULL;
|
||||
|
@ -2920,11 +2927,12 @@ static struct ImBuf *do_adjustment_impl(SeqRenderData context, Sequence *seq,
|
|||
return i;
|
||||
}
|
||||
|
||||
static struct ImBuf *do_adjustment(
|
||||
SeqRenderData context, Sequence *seq, float cfra,
|
||||
float UNUSED(facf0), float UNUSED(facf1),
|
||||
struct ImBuf *UNUSED(ibuf1), struct ImBuf *UNUSED(ibuf2),
|
||||
struct ImBuf *UNUSED(ibuf3)){
|
||||
static ImBuf *do_adjustment(
|
||||
SeqRenderData context, Sequence *seq, float cfra,
|
||||
float UNUSED(facf0), float UNUSED(facf1),
|
||||
struct ImBuf *UNUSED(ibuf1), struct ImBuf *UNUSED(ibuf2),
|
||||
struct ImBuf *UNUSED(ibuf3))
|
||||
{
|
||||
struct ImBuf *i = NULL;
|
||||
struct ImBuf *out;
|
||||
Editing *ed;
|
||||
|
@ -3214,13 +3222,14 @@ static void get_default_fac_fade(struct Sequence *seq, float cfra,
|
|||
*facf1 /= seq->len;
|
||||
}
|
||||
|
||||
static struct ImBuf *do_overdrop_effect(SeqRenderData context,
|
||||
Sequence *UNUSED(seq),
|
||||
float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1,
|
||||
struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3){
|
||||
static ImBuf *do_overdrop_effect(SeqRenderData context,
|
||||
Sequence *UNUSED(seq),
|
||||
float UNUSED(cfra),
|
||||
float facf0, float facf1,
|
||||
struct ImBuf *ibuf1,
|
||||
struct ImBuf *ibuf2,
|
||||
struct ImBuf *ibuf3)
|
||||
{
|
||||
struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
|
||||
int x = context.rectx;
|
||||
int y = context.recty;
|
||||
|
@ -3250,7 +3259,8 @@ static struct ImBuf *do_overdrop_effect(SeqRenderData context,
|
|||
return out;
|
||||
}
|
||||
|
||||
static struct SeqEffectHandle get_sequence_effect_impl(int seq_type){
|
||||
static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
|
||||
{
|
||||
struct SeqEffectHandle rval;
|
||||
int sequence_type = seq_type;
|
||||
|
||||
|
|
|
@ -217,7 +217,8 @@ static wchar_t *UNUSED_FUNCTION(BLI_alloc_utf16_from_8) (char *in8, size_t add)
|
|||
|
||||
|
||||
|
||||
struct dirent *readdir(DIR *dp){
|
||||
struct dirent *readdir(DIR *dp)
|
||||
{
|
||||
if (dp->direntry.d_name) {
|
||||
MEM_freeN(dp->direntry.d_name);
|
||||
dp->direntry.d_name = NULL;
|
||||
|
|
|
@ -261,7 +261,8 @@ void IMB_close_anim_proxies(struct anim *anim)
|
|||
IMB_free_indices(anim);
|
||||
}
|
||||
|
||||
struct anim *IMB_open_anim(const char *name, int ib_flags, int streamindex){
|
||||
struct anim *IMB_open_anim(const char *name, int ib_flags, int streamindex)
|
||||
{
|
||||
struct anim *anim;
|
||||
|
||||
anim = (struct anim *)MEM_callocN(sizeof(struct anim), "anim struct");
|
||||
|
@ -1159,7 +1160,7 @@ static void free_anim_redcode(struct anim *anim)
|
|||
/* Geen plaatje, probeer dan volgende animatie te openen */
|
||||
/* gelukt, haal dan eerste plaatje van animatie */
|
||||
|
||||
static struct ImBuf *anim_getnew(struct anim *anim)
|
||||
static ImBuf *anim_getnew(struct anim *anim)
|
||||
{
|
||||
struct ImBuf *ibuf = NULL;
|
||||
|
||||
|
@ -1222,7 +1223,8 @@ static struct ImBuf *anim_getnew(struct anim *anim)
|
|||
return(ibuf);
|
||||
}
|
||||
|
||||
struct ImBuf *IMB_anim_previewframe(struct anim *anim){
|
||||
struct ImBuf *IMB_anim_previewframe(struct anim *anim)
|
||||
{
|
||||
struct ImBuf *ibuf = NULL;
|
||||
int position = 0;
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ static void cineon_conversion_parameters(LogImageByteConversionParameters *param
|
|||
}
|
||||
#endif
|
||||
|
||||
static struct ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags)
|
||||
static ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size, int flags)
|
||||
{
|
||||
ImBuf *ibuf;
|
||||
LogImageFile *image;
|
||||
|
|
|
@ -198,8 +198,9 @@ void IMB_moviecache_destruct(void)
|
|||
delete_MEM_CacheLimiter(limitor);
|
||||
}
|
||||
|
||||
struct MovieCache *IMB_moviecache_create(int keysize, GHashHashFP hashfp, GHashCmpFP cmpfp,
|
||||
MovieCacheGetKeyDataFP getdatafp){
|
||||
MovieCache *IMB_moviecache_create(int keysize, GHashHashFP hashfp, GHashCmpFP cmpfp,
|
||||
MovieCacheGetKeyDataFP getdatafp)
|
||||
{
|
||||
MovieCache *cache;
|
||||
|
||||
cache = MEM_callocN(sizeof(MovieCache), "MovieCache");
|
||||
|
|
|
@ -301,7 +301,8 @@ int imb_savepng(struct ImBuf *ibuf, const char *name, int flags)
|
|||
return(1);
|
||||
}
|
||||
|
||||
struct ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags){
|
||||
ImBuf *imb_loadpng(unsigned char *mem, size_t size, int flags)
|
||||
{
|
||||
struct ImBuf *ibuf = NULL;
|
||||
png_structp png_ptr;
|
||||
png_infop info_ptr;
|
||||
|
|
|
@ -343,7 +343,8 @@ void imb_onehalf_no_alloc(struct ImBuf *ibuf2, struct ImBuf *ibuf1)
|
|||
|
||||
}
|
||||
|
||||
struct ImBuf *IMB_onehalf(struct ImBuf *ibuf1){
|
||||
ImBuf *IMB_onehalf(struct ImBuf *ibuf1)
|
||||
{
|
||||
struct ImBuf *ibuf2;
|
||||
|
||||
if (ibuf1 == NULL) return (NULL);
|
||||
|
@ -810,7 +811,7 @@ static int q_scale_linear_interpolation(
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
|
||||
static ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
|
||||
{
|
||||
const int do_rect = (ibuf->rect != NULL);
|
||||
const int do_float = (ibuf->rect_float != NULL);
|
||||
|
@ -940,7 +941,7 @@ static struct ImBuf *scaledownx(struct ImBuf *ibuf, int newx)
|
|||
}
|
||||
|
||||
|
||||
static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
|
||||
static ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
|
||||
{
|
||||
const int do_rect = (ibuf->rect != NULL);
|
||||
const int do_float = (ibuf->rect_float != NULL);
|
||||
|
@ -1071,7 +1072,7 @@ static struct ImBuf *scaledowny(struct ImBuf *ibuf, int newy)
|
|||
}
|
||||
|
||||
|
||||
static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
|
||||
static ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
|
||||
{
|
||||
uchar *rect, *_newrect = NULL, *newrect;
|
||||
float *rectf, *_newrectf = NULL, *newrectf;
|
||||
|
@ -1238,7 +1239,7 @@ static struct ImBuf *scaleupx(struct ImBuf *ibuf, int newx)
|
|||
return(ibuf);
|
||||
}
|
||||
|
||||
static struct ImBuf *scaleupy(struct ImBuf *ibuf, int newy)
|
||||
static ImBuf *scaleupy(struct ImBuf *ibuf, int newy)
|
||||
{
|
||||
uchar *rect, *_newrect = NULL, *newrect;
|
||||
float *rectf, *_newrectf = NULL, *newrectf;
|
||||
|
|
|
@ -544,7 +544,8 @@ partial_load:
|
|||
}
|
||||
|
||||
|
||||
struct ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags){
|
||||
ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
|
||||
{
|
||||
TARGA tga;
|
||||
struct ImBuf *ibuf;
|
||||
int col, count, size;
|
||||
|
|
|
@ -701,7 +701,8 @@ FunctionRNA *RNA_struct_find_function(PointerRNA *ptr, const char *identifier)
|
|||
#endif
|
||||
}
|
||||
|
||||
const struct ListBase *RNA_struct_type_functions(StructRNA *srna){
|
||||
const ListBase *RNA_struct_type_functions(StructRNA *srna)
|
||||
{
|
||||
return &srna->functions;
|
||||
}
|
||||
|
||||
|
@ -4851,7 +4852,8 @@ PropertyRNA *RNA_function_find_parameter(PointerRNA *UNUSED(ptr), FunctionRNA *f
|
|||
return BLI_findstring(&func->cont.properties, identifier, offsetof(PropertyRNA, identifier));
|
||||
}
|
||||
|
||||
const struct ListBase *RNA_function_defined_parameters(FunctionRNA *func){
|
||||
const ListBase *RNA_function_defined_parameters(FunctionRNA *func)
|
||||
{
|
||||
return &func->cont.properties;
|
||||
}
|
||||
|
||||
|
|
|
@ -51,7 +51,8 @@ EnumPropertyItem controller_type_items[] = {
|
|||
#include "BKE_sca.h"
|
||||
#include "DNA_actuator_types.h"
|
||||
|
||||
static struct StructRNA *rna_Controller_refine(struct PointerRNA *ptr){
|
||||
static StructRNA *rna_Controller_refine(struct PointerRNA *ptr)
|
||||
{
|
||||
bController *controller = (bController *)ptr->data;
|
||||
|
||||
switch (controller->type) {
|
||||
|
|
|
@ -196,7 +196,8 @@ void rna_Main_objects_remove(Main *bmain, ReportList *reports, struct Object *ob
|
|||
}
|
||||
}
|
||||
|
||||
struct Material *rna_Main_materials_new(Main *UNUSED(bmain), const char *name){
|
||||
Material *rna_Main_materials_new(Main *UNUSED(bmain), const char *name)
|
||||
{
|
||||
ID *id = (ID *)BKE_material_add(name);
|
||||
id_us_min(id);
|
||||
return (Material *)id;
|
||||
|
@ -212,7 +213,8 @@ void rna_Main_materials_remove(Main *bmain, ReportList *reports, struct Material
|
|||
/* XXX python now has invalid pointer? */
|
||||
}
|
||||
|
||||
struct bNodeTree *rna_Main_nodetree_new(Main *UNUSED(bmain), const char *name, int type){
|
||||
bNodeTree *rna_Main_nodetree_new(Main *UNUSED(bmain), const char *name, int type)
|
||||
{
|
||||
bNodeTree *tree = ntreeAddTree(name, type, NODE_GROUP);
|
||||
|
||||
id_us_min(&tree->id);
|
||||
|
|
Loading…
Reference in New Issue