[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41545] trunk/blender/source: macro formatting & remve some unused code.
Campbell Barton
ideasman42 at gmail.com
Sat Nov 5 06:44:58 CET 2011
Revision: 41545
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41545
Author: campbellbarton
Date: 2011-11-05 05:44:52 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
macro formatting & remve some unused code.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_context.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/editors/space_graph/graph_draw.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_color.c
trunk/blender/source/blender/nodes/composite/node_composite_util.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/python/generic/bgl.h
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/render/intern/include/texture.h
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
Modified: trunk/blender/source/blender/blenkernel/BKE_context.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_context.h 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/blenkernel/BKE_context.h 2011-11-05 05:44:52 UTC (rev 41545)
@@ -203,17 +203,17 @@
/*void CTX_data_pointer_set(bContextDataResult *result, void *data);
void CTX_data_list_add(bContextDataResult *result, void *data);*/
-#define CTX_DATA_BEGIN(C, Type, instance, member) \
- { \
- 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) { \
+#define CTX_DATA_BEGIN(C, Type, instance, member) \
+ { \
+ 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;
-#define CTX_DATA_END \
- } \
- BLI_freelistN(&ctx_data_list); \
+#define CTX_DATA_END \
+ } \
+ BLI_freelistN(&ctx_data_list); \
}
int ctx_data_list_count(const bContext *C, int (*func)(const bContext*, ListBase*));
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2011-11-05 05:44:52 UTC (rev 41545)
@@ -67,21 +67,21 @@
void seq_end(SeqIterator *iter);
void seq_array(struct Editing *ed, struct Sequence ***seqarray, int *tot, int use_pointer);
-#define SEQP_BEGIN(ed, _seq) \
-{ \
- SeqIterator iter;\
- for(seq_begin(ed, &iter, 1); iter.valid; seq_next(&iter)) { \
+#define SEQP_BEGIN(ed, _seq) \
+{ \
+ SeqIterator iter; \
+ 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)) { \
+#define SEQ_BEGIN(ed, _seq) \
+ { \
+ SeqIterator iter; \
+ for(seq_begin(ed, &iter, 0); iter.valid; seq_next(&iter)) { \
_seq= iter.seq;
-#define SEQ_END \
- } \
- seq_end(&iter); \
+#define SEQ_END \
+ } \
+ seq_end(&iter); \
}
typedef struct SeqRenderData {
Modified: trunk/blender/source/blender/editors/space_graph/graph_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_draw.c 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/editors/space_graph/graph_draw.c 2011-11-05 05:44:52 UTC (rev 41545)
@@ -78,11 +78,11 @@
* - intV: integer value containing color info packed into an int
* - alpha: float value describing the
*/
-#define cpackA(intVC, alpha) \
- { \
- float _cpackCol[3]; \
- cpack_to_rgb(intVC, &_cpackCol[0], &_cpackCol[1], &_cpackCol[2]); \
- glColor4f(_cpackCol[0], _cpackCol[1], _cpackCol[2], alpha); \
+#define cpackA(intVC, alpha) \
+ { \
+ float _cpackCol[3]; \
+ cpack_to_rgb(intVC, &_cpackCol[0], &_cpackCol[1], &_cpackCol[2]); \
+ glColor4f(_cpackCol[0], _cpackCol[1], _cpackCol[2], alpha); \
}
/* *************************** */
Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c 2011-11-05 05:44:52 UTC (rev 41545)
@@ -103,8 +103,8 @@
/* this condition has been made more complex since editmode can draw textures */
-#define CHECK_OB_DRAWTEXTURE(vd, dt) \
- ((vd->drawtype==OB_TEXTURE && dt>OB_SOLID) || \
+#define CHECK_OB_DRAWTEXTURE(vd, dt) \
+ ((vd->drawtype==OB_TEXTURE && dt>OB_SOLID) || \
(vd->drawtype==OB_SOLID && vd->flag2 & V3D_SOLID_TEX))
static void draw_bounding_volume(Scene *scene, Object *ob, char type);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_header.c 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_header.c 2011-11-05 05:44:52 UTC (rev 41545)
@@ -83,9 +83,6 @@
* This can be cleaned when I make some new 'mode' icons.
*/
-#define TEST_EDITMESH if(obedit==0) return; \
- if( (v3d->lay & obedit->lay)==0 ) return;
-
/* view3d handler codes */
#define VIEW3D_HANDLER_BACKGROUND 1
#define VIEW3D_HANDLER_PROPERTIES 2
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2011-11-05 05:44:52 UTC (rev 41545)
@@ -440,10 +440,10 @@
#define USER_TOOLTIPS_PYTHON (1 << 26)
/* helper macro for checking frame clamping */
-#define FRAMENUMBER_MIN_CLAMP(cfra) \
- { \
- if ((U.flag & USER_NONEGFRAMES) && (cfra < 0)) \
- cfra = 0; \
+#define FRAMENUMBER_MIN_CLAMP(cfra) \
+ { \
+ if ((U.flag & USER_NONEGFRAMES) && (cfra < 0)) \
+ cfra = 0; \
}
/* viewzom */
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2011-11-05 03:29:37 UTC (rev 41544)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2011-11-05 05:44:52 UTC (rev 41545)
@@ -874,37 +874,49 @@
void RNA_collection_add(PointerRNA *ptr, const char *name, PointerRNA *r_value);
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)) { \
+#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)) \
+ { \
PointerRNA itemptr= rna_macro_iter.ptr;
-#define RNA_END \
- } \
- RNA_property_collection_end(&rna_macro_iter); \
+#define RNA_END \
+ } \
+ RNA_property_collection_end(&rna_macro_iter); \
}
-#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)) { \
+#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)) \
+ { \
PointerRNA itemptr= rna_macro_iter.ptr;
-#define RNA_PROP_END \
- } \
- RNA_property_collection_end(&rna_macro_iter); \
+#define RNA_PROP_END \
+ } \
+ RNA_property_collection_end(&rna_macro_iter); \
}
-#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)) { \
+#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; \
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list