style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Thu, 18 Apr 2013 01:52:38 +0000 (01:52 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 18 Apr 2013 01:52:38 +0000 (01:52 +0000)
15 files changed:
source/blender/avi/intern/avi_intern.h
source/blender/avi/intern/avi_mjpeg.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/softbody.c
source/blender/editors/physics/particle_object.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/quicktime/apple/qtkit_import.m
source/blender/render/extern/include/RE_pipeline.h
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Expressions/InputParser.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/VideoTexture/Texture.cpp

index f3e33ecf86f170bac97d4d9b649fbc12da74d7dc..0b49404761282f23cd3c66d8ba225d98a0ad1d7b 100644 (file)
@@ -59,7 +59,7 @@ unsigned int GET_TCC(FILE *fp);
        putc(ch2[1], fp); \
 } (void)0
 
-void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size);
+void *avi_format_convert(AviMovie *movie, int stream, void *buffer, AviFormat from, AviFormat to, int *size);
 
 int avi_get_data_id(AviFormat format, int stream);
 int avi_get_format_type(AviFormat format);
index 6ae0e56ffa408fe723b80861c64956db32173405..e8cba1849e70e392d1a5ed624ad7b87973b6a58c 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef __AVI_MJPEG_H__
 #define __AVI_MJPEG_H__
 
-void *avi_converter_from_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
-void *avi_converter_to_mjpeg (AviMovie *movie, int stream, unsigned char *buffer, int *size);
+void *avi_converter_from_mjpeg(AviMovie *movie, int stream, unsigned char *buffer, int *size);
+void *avi_converter_to_mjpeg(AviMovie *movie, int stream, unsigned char *buffer, int *size);
 
 #endif /* __AVI_MJPEG_H__ */
index fe8dc7cc938bd6a0897fa28b1dd44e7d67ce682a..f616da4985fa3a04649b8fcf5aab6f27ce95ffdb 100644 (file)
@@ -75,13 +75,13 @@ typedef enum OverlayControlFlags {
        PAINT_OVERLAY_OVERRIDE = (1 << 3)
 } OverlayControlFlags;
 
-void BKE_paint_invalidate_overlay_tex (struct Scene *scene, const struct Tex *tex);
-void BKE_paint_invalidate_cursor_overlay (struct Scene *scene, struct CurveMapping *curve);
+void BKE_paint_invalidate_overlay_tex(struct Scene *scene, const struct Tex *tex);
+void BKE_paint_invalidate_cursor_overlay(struct Scene *scene, struct CurveMapping *curve);
 void BKE_paint_invalidate_overlay_all(void);
-OverlayControlFlags BKE_paint_get_overlay_flags (void);
-void BKE_paint_reset_overlay_invalid (void);
-void BKE_paint_set_overlay_override (bool flag);
-bool BKE_paint_get_overlay_override (void);
+OverlayControlFlags BKE_paint_get_overlay_flags(void);
+void BKE_paint_reset_overlay_invalid(void);
+void BKE_paint_set_overlay_override(bool flag);
+bool BKE_paint_get_overlay_override(void);
 
 
 void BKE_paint_init(struct Paint *p, const char col[3]);
index 3fbbc4841698c6d5c3e237cf15c275f774e18e7b..e2f04e68bf3bc84ffc7cbc5ddceeeeb70857bdea 100644 (file)
@@ -193,7 +193,7 @@ static void precalculate_effector(EffectorCache *eff)
                }
        }
        else if (eff->pd->shape == PFIELD_SHAPE_SURFACE) {
-               eff->surmd = (SurfaceModifierData *)modifiers_findByType ( eff->ob, eModifierType_Surface );
+               eff->surmd = (SurfaceModifierData *)modifiers_findByType( eff->ob, eModifierType_Surface );
                if (eff->ob->type == OB_CURVE)
                        eff->flag |= PE_USE_NORMAL_DATA;
        }
index 8e5e0da20f927802c2c256037258a034389d9f3b..54226d231ae3848165c54e4cf99632e44e862a8a 100644 (file)
@@ -3316,7 +3316,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
                 */
 
                if (sb->namedVG_Mass[0]) {
-                       int defgrp_index = defgroup_name_index (ob, sb->namedVG_Mass);
+                       int defgrp_index = defgroup_name_index(ob, sb->namedVG_Mass);
                        /* printf("VGN  %s %d\n", sb->namedVG_Mass, defgrp_index); */
                        if (defgrp_index != -1) {
                                get_scalar_from_vertexgroup(ob, a, defgrp_index, &bp->mass);
@@ -3329,7 +3329,7 @@ static void mesh_to_softbody(Scene *scene, Object *ob)
                bp->springweight = 1.0f;
 
                if (sb->namedVG_Spring_K[0]) {
-                       int defgrp_index = defgroup_name_index (ob, sb->namedVG_Spring_K);
+                       int defgrp_index = defgroup_name_index(ob, sb->namedVG_Spring_K);
                        //printf("VGN  %s %d\n", sb->namedVG_Spring_K, defgrp_index);
                        if (defgrp_index  != -1) {
                                get_scalar_from_vertexgroup(ob, a, defgrp_index , &bp->springweight);
index 5fd2a0806e93aeaebef2a379a566924cdeace403..ed7f9a4c1f2c528bec113a6f7f2b7efacb4f16c8 100644 (file)
@@ -656,7 +656,7 @@ static int connect_hair(Scene *scene, Object *ob, ParticleSystem *psys)
        DM_ensure_tessface(dm);
 
 
-       numverts = dm->getNumVerts (dm);
+       numverts = dm->getNumVerts(dm);
 
        /* convert to global coordinates */
        for (i=0; i<numverts; i++)
index 1440be9ff85e17c767eca80cb38dfe93c3f22d1e..b1dd0274b50173f6db136d9493cca39e7d48fc25 100644 (file)
@@ -698,7 +698,7 @@ void setInputPostFct(MouseInput *mi, void   (*post)(struct TransInfo *t, float val
 /*********************** Generics ********************************/
 
 int initTransInfo(struct bContext *C, TransInfo *t, struct wmOperator *op, const struct wmEvent *event);
-void postTrans (struct bContext *C, TransInfo *t);
+void postTrans(struct bContext *C, TransInfo *t);
 void resetTransRestrictions(TransInfo *t);
 
 void drawLine(TransInfo *t, const float center[3], const float dir[3], char axis, short options);
index 747fae93ace2a67c199ac281ad21e7098754b785..b41bcbd15dd08e095b13cf55400b8a27ba495b06 100644 (file)
@@ -2424,10 +2424,10 @@ static void createTransUVs(bContext *C, TransInfo *t)
        if (propconnected) {
                /* create element map with island information */
                if (ts->uv_flag & UV_SYNC_SELECTION) {
-                       elementmap = EDBM_uv_element_map_create (em, FALSE, TRUE);
+                       elementmap = EDBM_uv_element_map_create(em, false, true);
                }
                else {
-                       elementmap = EDBM_uv_element_map_create (em, TRUE, TRUE);
+                       elementmap = EDBM_uv_element_map_create(em, true, true);
                }
                island_enabled = MEM_callocN(sizeof(*island_enabled) * elementmap->totalIslands, "TransIslandData(UV Editing)");
        }
index c7977689bc446352e8814cf14cd3ff674611a7c9..458d6999bf8cff378b53b11827ecddbbcacdb1f0 100644 (file)
@@ -1310,13 +1310,13 @@ static int stitch_process_data(StitchState *state, Scene *scene, int final)
                if (state->mode == STITCH_VERT) {
                        UvElement *element = state->selection_stack[i];
 
-                       stitch_propagate_uv_final_position (element, i, preview_position, final_position, state, final, scene);
+                       stitch_propagate_uv_final_position(element, i, preview_position, final_position, state, final, scene);
                }
                else {
                        UvEdge *edge = state->selection_stack[i];
 
-                       stitch_propagate_uv_final_position (state->uvs[edge->uv1], edge->uv1, preview_position, final_position, state, final, scene);
-                       stitch_propagate_uv_final_position (state->uvs[edge->uv2], edge->uv2, preview_position, final_position, state, final, scene);
+                       stitch_propagate_uv_final_position(state->uvs[edge->uv1], edge->uv1, preview_position, final_position, state, final, scene);
+                       stitch_propagate_uv_final_position(state->uvs[edge->uv2], edge->uv2, preview_position, final_position, state, final, scene);
 
                        edge->flag &= (STITCH_SELECTED | STITCH_BOUNDARY);
                }
index 700d2614248b6ea0437142147fb5eee607231917..e23fb29446a09b6a9854db5497417e2a5c700bb0 100644 (file)
@@ -155,7 +155,7 @@ static ImBuf *nsImageToiBuf(NSImage *sourceImage, int width, int height)
        NSEnumerator *enumerator;
        NSImageRep *representation;
        
-       ibuf = IMB_allocImBuf (width, height, 32, IB_rect);
+       ibuf = IMB_allocImBuf(width, height, 32, IB_rect);
        if (!ibuf) {
                if (QTIME_DEBUG) {
                        printf("quicktime_import: could not allocate memory for the image.\n");
@@ -307,7 +307,7 @@ int startquicktime(struct anim *anim)
        QTTime qtTimeDuration;
        NSDictionary *attributes;
        
-       anim->qtime = MEM_callocN (sizeof(QuicktimeMovie),"animqt");
+       anim->qtime = MEM_callocN(sizeof(QuicktimeMovie),"animqt");
 
        if (anim->qtime == NULL) {
                if(QTIME_DEBUG) printf("Can't alloc qtime: %s\n", anim->name);
@@ -365,7 +365,7 @@ int startquicktime(struct anim *anim)
                return -1;
        }
 
-       anim->qtime->ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect);
+       anim->qtime->ibuf = IMB_allocImBuf(anim->x, anim->y, 32, IB_rect);
        
        qtTimeDuration = [[anim->qtime->media attributeForKey:QTMediaDurationAttribute] QTTimeValue];
        anim->qtime->durationTime = qtTimeDuration.timeValue;
index 9a8b1620f71745e8a68b3c064123053e196fd5e3..9e8432b378730ffe271dd8e91f6c22358f66ae89 100644 (file)
@@ -155,7 +155,7 @@ typedef struct RenderStats {
 
 /* the name is used as identifier, so elsewhere in blender the result can retrieved */
 /* calling a new render with same name, frees automatic existing render */
-struct Render *RE_NewRender (const char *name);
+struct Render *RE_NewRender(const char *name);
 struct Render *RE_GetRender(const char *name);
 
 /* assign default dummy callbacks */
index 46075ea933d0e6519dbb82d68f2dfc6611eb5a24..ce805c774effd462bd0b2e716538b20e7614b464 100644 (file)
@@ -61,9 +61,9 @@ public:
        virtual CValue* GetReplica();
        virtual void ProcessReplica();
        
-       void SetBlendTime (float newtime);
-       void SetLocalTime (float curtime);
-       void ResetStartTime (float curtime);
+       void SetBlendTime(float newtime);
+       void SetLocalTime(float curtime);
+       void ResetStartTime(float curtime);
        
        bAction*        GetAction() { return m_action; }
        void            SetAction(bAction* act) { m_action= act; }
index ed89fb133377a1a1cf912089a111f1f55a2569f8..4ba3585455b16957bb9084da2d4aa33c6644529b 100644 (file)
@@ -542,7 +542,7 @@ CExpression *CParser::Ex(int i)
                                                        errmsg=NULL;
                                                } else {
                                                        // does this happen ?
-                                                       MT_assert ("does this happen");
+                                                       MT_assert("does this happen");
                                                }
                                        }
                                        e1 = Error(errtext);
index e90f7573ab1043f7c6b8b57b3be44fd32ec57cdf..a8d03f9f33786b00dcb05f325e763039290937ad 100644 (file)
@@ -328,13 +328,13 @@ bool RAS_OpenGLRasterizer::BeginFrame(int drawingmode, double time)
        // Blender camera routine destroys the settings
        if (m_drawingmode < KX_SOLID)
        {
-               glDisable (GL_CULL_FACE);
-               glDisable (GL_DEPTH_TEST);
+               glDisable(GL_CULL_FACE);
+               glDisable(GL_DEPTH_TEST);
        }
        else
        {
                glEnable(GL_DEPTH_TEST);
-               glEnable (GL_CULL_FACE);
+               glEnable(GL_CULL_FACE);
        }
 
        glDisable(GL_BLEND);
index aebc2aeef0117411b0f74cb0cc3363081217b91d..1efbc50bfe0d50f95faf7f820a63858a615906f7 100644 (file)
@@ -381,7 +381,7 @@ static PyObject *Texture_refresh(Texture *self, PyObject *args)
                                                texture = self->m_scaledImg;
                                        }
                                        // load texture for rendering
-                                       loadTexture (self->m_actTex, texture, size, self->m_mipmap);
+                                       loadTexture(self->m_actTex, texture, size, self->m_mipmap);
 
                                        // refresh texture source, if required
                                        if (refreshSource) self->m_source->m_image->refresh();