diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-18 05:52:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-18 05:52:38 +0400 |
commit | 3f7f07faf51c16f11e5eefeddb537b2e1b024f58 (patch) | |
tree | c33a03d05bf774ea363d355694432a400487ec10 | |
parent | 9cceec40c47543eb372bd9c1331901857b5f120a (diff) |
style cleanup
-rw-r--r-- | source/blender/avi/intern/avi_intern.h | 2 | ||||
-rw-r--r-- | source/blender/avi/intern/avi_mjpeg.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_object.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform.h | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 4 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_smart_stitch.c | 6 | ||||
-rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 6 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 | ||||
-rw-r--r-- | source/gameengine/Converter/BL_ActionActuator.h | 6 | ||||
-rw-r--r-- | source/gameengine/Expressions/InputParser.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 6 | ||||
-rw-r--r-- | source/gameengine/VideoTexture/Texture.cpp | 2 |
15 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/avi/intern/avi_intern.h b/source/blender/avi/intern/avi_intern.h index f3e33ecf86f..0b494047612 100644 --- a/source/blender/avi/intern/avi_intern.h +++ b/source/blender/avi/intern/avi_intern.h @@ -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); diff --git a/source/blender/avi/intern/avi_mjpeg.h b/source/blender/avi/intern/avi_mjpeg.h index 6ae0e56ffa4..e8cba1849e7 100644 --- a/source/blender/avi/intern/avi_mjpeg.h +++ b/source/blender/avi/intern/avi_mjpeg.h @@ -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__ */ diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index fe8dc7cc938..f616da4985f 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -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]); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 3fbbc484169..e2f04e68bf3 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -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; } diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 8e5e0da20f9..54226d231ae 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -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); diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 5fd2a0806e9..ed7f9a4c1f2 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -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++) diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 1440be9ff85..b1dd0274b50 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -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); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 747fae93ace..b41bcbd15dd 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -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)"); } diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index c7977689bc4..458d6999bf8 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -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); } diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 700d2614248..e23fb29446a 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -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; diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 9a8b1620f71..9e8432b3787 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -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 */ diff --git a/source/gameengine/Converter/BL_ActionActuator.h b/source/gameengine/Converter/BL_ActionActuator.h index 46075ea933d..ce805c774ef 100644 --- a/source/gameengine/Converter/BL_ActionActuator.h +++ b/source/gameengine/Converter/BL_ActionActuator.h @@ -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; } diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp index ed89fb13337..4ba3585455b 100644 --- a/source/gameengine/Expressions/InputParser.cpp +++ b/source/gameengine/Expressions/InputParser.cpp @@ -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); diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index e90f7573ab1..a8d03f9f337 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -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); diff --git a/source/gameengine/VideoTexture/Texture.cpp b/source/gameengine/VideoTexture/Texture.cpp index aebc2aeef01..1efbc50bfe0 100644 --- a/source/gameengine/VideoTexture/Texture.cpp +++ b/source/gameengine/VideoTexture/Texture.cpp @@ -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(); |