[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49687] trunk/blender/source/blender/ blenkernel: Code cleanup: remove redundant struct and some space cleanup
Sergey Sharybin
sergey.vfx at gmail.com
Wed Aug 8 13:15:38 CEST 2012
Revision: 49687
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49687
Author: nazgul
Date: 2012-08-08 11:15:38 +0000 (Wed, 08 Aug 2012)
Log Message:
-----------
Code cleanup: remove redundant struct and some space cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2012-08-08 11:15:36 UTC (rev 49686)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2012-08-08 11:15:38 UTC (rev 49687)
@@ -92,9 +92,8 @@
float motion_blur_shutter;
} SeqRenderData;
-SeqRenderData seq_new_render_data(
- struct Main *bmain, struct Scene *scene,
- int rectx, int recty, int preview_render_size);
+SeqRenderData seq_new_render_data(struct Main *bmain, struct Scene *scene, int rectx, int recty,
+ int preview_render_size);
/* Wipe effect */
enum {
@@ -106,7 +105,6 @@
DO_CLOCK_WIPE
};
-
struct SeqEffectHandle {
/* constructors & destructor */
/* init is _only_ called on first creation */
@@ -143,11 +141,8 @@
* float-rects or byte-rects
* (mixed cases are handled one layer up...) */
- struct ImBuf * (*execute)(SeqRenderData context,
- struct Sequence *seq, float cfra,
- float facf0, float facf1,
- struct ImBuf *ibuf1, struct ImBuf *ibuf2,
- struct ImBuf *ibuf3);
+ struct ImBuf * (*execute)(SeqRenderData context, struct Sequence *seq, float cfra, float facf0, float facf1,
+ struct ImBuf *ibuf1, struct ImBuf *ibuf2, struct ImBuf *ibuf3);
};
/* ********************* prototypes *************** */
@@ -175,8 +170,8 @@
void BKE_sequencer_sort(struct Scene *scene);
struct Sequence *BKE_sequencer_active_get(struct Scene *scene);
-int BKE_sequencer_active_get_pair(struct Scene *scene,
- struct Sequence **seq_act, struct Sequence **seq_other);
+int BKE_sequencer_active_get_pair(struct Scene *scene, struct Sequence **seq_act,
+ struct Sequence **seq_other);
void BKE_sequencer_active_set(struct Scene *scene, struct Sequence *seq);
struct Mask *BKE_sequencer_mask_get(struct Scene *scene);
@@ -185,7 +180,7 @@
int seq_recursive_apply(struct Sequence *seq, int (*apply_func)(struct Sequence *, void *), void *arg);
/* maintenance functions, mostly for RNA */
-// extern
+/* extern */
void seq_free_sequence(struct Scene *scene, struct Sequence *seq);
void seq_free_clipboard(void);
@@ -196,18 +191,15 @@
int evaluate_seq_frame(struct Scene *scene, int cfra);
struct StripElem *give_stripelem(struct Sequence *seq, int cfra);
-// intern
+/* intern */
void update_changed_seq_and_deps(struct Scene *scene, struct Sequence *changed_seq, int len_change, int ibuf_change);
-int input_have_to_preprocess(
- SeqRenderData context, struct Sequence *seq, float cfra);
+int input_have_to_preprocess(SeqRenderData context, struct Sequence *seq, float cfra);
struct SeqIndexBuildContext *seq_proxy_rebuild_context(struct Main *bmain, struct Scene *scene, struct Sequence *seq);
-void seq_proxy_rebuild(struct SeqIndexBuildContext *context,
- short *stop, short *do_update, float *progress);
+void seq_proxy_rebuild(struct SeqIndexBuildContext *context, short *stop, short *do_update, float *progress);
void seq_proxy_rebuild_finish(struct SeqIndexBuildContext *context, short stop);
-
/* **********************************************************************
* seqcache.c
*
@@ -225,16 +217,14 @@
void seq_stripelem_cache_cleanup(void);
/* returned ImBuf is properly refed and has to be freed */
-struct ImBuf *seq_stripelem_cache_get(SeqRenderData context, struct Sequence *seq,
- float cfra, seq_stripelem_ibuf_t type);
+struct ImBuf *seq_stripelem_cache_get(SeqRenderData context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type);
/* passed ImBuf is properly refed, so ownership is *not*
* transfered to the cache.
* you can pass the same ImBuf multiple times to the cache without problems.
*/
-void seq_stripelem_cache_put(SeqRenderData context, struct Sequence *seq,
- float cfra, seq_stripelem_ibuf_t type, struct ImBuf *nval);
+void seq_stripelem_cache_put(SeqRenderData context, struct Sequence *seq, float cfra, seq_stripelem_ibuf_t type, struct ImBuf *nval);
/* **********************************************************************
* seqeffects.c
@@ -271,8 +261,7 @@
void seq_sound_init(struct Scene *scene, struct Sequence *seq);
struct Sequence *seq_foreground_frame_get(struct Scene *scene, int frame);
struct ListBase *seq_seqbase(struct ListBase *seqbase, struct Sequence *seq);
-struct Sequence *seq_metastrip(ListBase *seqbase /* = ed->seqbase */,
- struct Sequence *meta /* = NULL */, struct Sequence *seq);
+struct Sequence *seq_metastrip(ListBase *seqbase /* = ed->seqbase */, struct Sequence *meta /* = NULL */, struct Sequence *seq);
void seq_offset_animdata(struct Scene *scene, struct Sequence *seq, int ofs);
void seq_dupe_animdata(struct Scene *scene, const char *name_src, const char *name_dst);
@@ -338,4 +327,4 @@
extern ListBase seqbase_clipboard;
extern int seqbase_clipboard_frame;
-#endif // __BKE_SEQUENCER_H__
+#endif /* __BKE_SEQUENCER_H__ */
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-08-08 11:15:36 UTC (rev 49686)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-08-08 11:15:38 UTC (rev 49687)
@@ -252,7 +252,7 @@
static ImBuf *do_alphaover_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0,
float facf1, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_alphaover_effect_float(
@@ -415,7 +415,7 @@
static ImBuf *do_alphaunder_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
float facf0, float facf1, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_alphaunder_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@@ -760,7 +760,7 @@
static ImBuf *do_gammacross_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra),
float facf0, float facf1, ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
build_gammatabs();
@@ -867,7 +867,7 @@
static ImBuf *do_add_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_add_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@@ -969,7 +969,7 @@
static ImBuf *do_sub_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_sub_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@@ -1164,7 +1164,7 @@
static ImBuf *do_mul_effect(SeqRenderData context, Sequence *UNUSED(seq), float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_mul_effect_float(facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@@ -1198,7 +1198,7 @@
wipezone->pythangle = 1.0f / sqrtf(wipezone->angle * wipezone->angle + 1.0f);
}
-// This function calculates the blur band for the wipe effects
+/* This function calculates the blur band for the wipe effects */
static float in_band(float width, float dist, int side, int dir)
{
float alpha;
@@ -1460,7 +1460,7 @@
if (seq->effectdata)
MEM_freeN(seq->effectdata);
- seq->effectdata = MEM_callocN(sizeof(struct WipeVars), "wipevars");
+ seq->effectdata = MEM_callocN(sizeof(WipeVars), "wipevars");
}
static int num_inputs_wipe(void)
@@ -1602,7 +1602,7 @@
static ImBuf *do_wipe_effect(SeqRenderData context, Sequence *seq, float UNUSED(cfra), float facf0, float facf1,
ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
if (out->rect_float) {
do_wipe_effect_float(seq, facf0, facf1, context.rectx, context.recty, ibuf1->rect_float,
@@ -1625,7 +1625,7 @@
if (seq->effectdata)
MEM_freeN(seq->effectdata);
- seq->effectdata = MEM_callocN(sizeof(struct TransformVars), "transformvars");
+ seq->effectdata = MEM_callocN(sizeof(TransformVars), "transformvars");
transform = (TransformVars *) seq->effectdata;
@@ -1742,7 +1742,7 @@
static ImBuf *do_transform_effect(SeqRenderData context, Sequence *seq, float UNUSED(cfra), float facf0,
float UNUSED(facf1), ImBuf *ibuf1, ImBuf *ibuf2, ImBuf *ibuf3)
{
- struct ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
+ ImBuf *out = prepare_effect_imbufs(context, ibuf1, ibuf2, ibuf3);
do_transform(context.scene, seq, facf0, context.rectx, context.recty, ibuf1, out);
@@ -2172,7 +2172,7 @@
if (seq->effectdata)
MEM_freeN(seq->effectdata);
- seq->effectdata = MEM_callocN(sizeof(struct GlowVars), "glowvars");
+ seq->effectdata = MEM_callocN(sizeof(GlowVars), "glowvars");
glow = (GlowVars *)seq->effectdata;
glow->fMini = 0.25;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list