Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style cleanup: for loop macros, also add a config file for uncrustify source formatter (able to get very close to our own style guide).

Browse Source
This commit is contained in:
Campbell Barton
2012-04-15 07:24:14 +00:00
parent 3f605bff4b
commit e7f1033dcb
4 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/blenkernel/BKE_context.h
View File

@@ -212,8 +212,11 @@ void CTX_data_list_add(bContextDataResult *result, void *data);
ListBase ctx_data_list; \
CollectionPointerLink *ctx_link; \
CTX_data_##member(C, &ctx_data_list); \
for(ctx_link=ctx_data_list.first; ctx_link; ctx_link=ctx_link->next) {\
Type instance= ctx_link->ptr.data;
for (ctx_link = ctx_data_list.first; \
ctx_link; \
ctx_link = ctx_link->next) \
{ \
Type instance = ctx_link->ptr.data;
#define CTX_DATA_END \
} \

14
source/blender/blenkernel/BKE_sequencer.h
View File

@@ -69,14 +69,14 @@ void seq_array(struct Editing *ed, struct Sequence ***seqarray, int *tot, int us
#define SEQP_BEGIN(ed, _seq) \
{ \
SeqIterator iter; \
for(seq_begin(ed, &iter, 1); iter.valid; seq_next(&iter)) { \
_seq= iter.seq;
for (seq_begin(ed, &iter, 1); iter.valid; seq_next(&iter)) { \
_seq = iter.seq;
#define SEQ_BEGIN(ed, _seq) \
{ \
SeqIterator iter; \
for(seq_begin(ed, &iter, 0); iter.valid; seq_next(&iter)) { \
_seq= iter.seq;
for (seq_begin(ed, &iter, 0); iter.valid; seq_next(&iter)) { \
_seq = iter.seq;
#define SEQ_END \
} \
@@ -138,12 +138,10 @@ struct SeqEffectHandle {
int (*early_out)(struct Sequence *seq, float facf0, float facf1);
/* stores the y-range of the effect IPO */
void (*store_icu_yrange)(struct Sequence * seq,
short adrcode, float *ymin, float *ymax);
void (*store_icu_yrange)(struct Sequence * seq, short adrcode, float *ymin, float *ymax);
/* stores the default facf0 and facf1 if no IPO is present */
void (*get_default_fac)(struct Sequence *seq, float cfra,
float * facf0, float * facf1);
void (*get_default_fac)(struct Sequence *seq, float cfra, float * facf0, float * facf1);
/* execute the effect
* sequence effects are only required to either support

30
source/blender/makesrna/RNA_access.h
View File

@@ -902,11 +902,11 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name);
#define RNA_BEGIN(sptr, itemptr, propname) \
{ \
CollectionPropertyIterator rna_macro_iter; \
for(RNA_collection_begin(sptr, propname, &rna_macro_iter); \
rna_macro_iter.valid; \
RNA_property_collection_next(&rna_macro_iter)) \
for (RNA_collection_begin(sptr, propname, &rna_macro_iter); \
rna_macro_iter.valid; \
RNA_property_collection_next(&rna_macro_iter)) \
{ \
PointerRNA itemptr= rna_macro_iter.ptr;
PointerRNA itemptr = rna_macro_iter.ptr;
#define RNA_END \
} \
@@ -916,11 +916,11 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name);
#define RNA_PROP_BEGIN(sptr, itemptr, prop) \
{ \
CollectionPropertyIterator rna_macro_iter; \
for(RNA_property_collection_begin(sptr, prop, &rna_macro_iter); \
rna_macro_iter.valid; \
RNA_property_collection_next(&rna_macro_iter)) \
for (RNA_property_collection_begin(sptr, prop, &rna_macro_iter); \
rna_macro_iter.valid; \
RNA_property_collection_next(&rna_macro_iter)) \
{ \
PointerRNA itemptr= rna_macro_iter.ptr;
PointerRNA itemptr = rna_macro_iter.ptr;
#define RNA_PROP_END \
} \
@@ -930,14 +930,14 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name);
#define RNA_STRUCT_BEGIN(sptr, prop) \
{ \
CollectionPropertyIterator rna_macro_iter; \
for(RNA_property_collection_begin( \
sptr, \
RNA_struct_iterator_property(sptr->type), \
&rna_macro_iter); \
rna_macro_iter.valid; \
RNA_property_collection_next(&rna_macro_iter)) \
for (RNA_property_collection_begin( \
sptr, \
RNA_struct_iterator_property(sptr->type), \
&rna_macro_iter); \
rna_macro_iter.valid; \
RNA_property_collection_next(&rna_macro_iter)) \
{ \
PropertyRNA *prop= rna_macro_iter.ptr.data;
PropertyRNA *prop = rna_macro_iter.ptr.data;
#define RNA_STRUCT_END \
} \

6
source/blender/makesrna/RNA_types.h
View File

@@ -346,8 +346,10 @@ typedef enum StructFlag {
typedef int (*StructValidateFunc)(struct PointerRNA *ptr, void *data, int *have_function);
typedef int (*StructCallbackFunc)(struct bContext *C, struct PointerRNA *ptr, struct FunctionRNA *func, ParameterList *list);
typedef void (*StructFreeFunc)(void *data);
typedef struct StructRNA *(*StructRegisterFunc)(struct Main *bmain, struct ReportList *reports, void *data,
const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
typedef struct StructRNA *(*StructRegisterFunc)(
struct Main *bmain, struct ReportList *reports, void *data, const char *identifier,
StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free);
typedef void (*StructUnregisterFunc)(struct Main *bmain, struct StructRNA *type);
typedef void **(*StructInstanceFunc)(PointerRNA *ptr);