diff options
Diffstat (limited to 'source/blender')
18 files changed, 42 insertions, 48 deletions
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index c94ffd3205f..97948683e22 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -272,7 +272,7 @@ static void ptcache_particle_read(int index, void *psys_v, void **data, float cf ParticleSystem *psys= psys_v; ParticleData *pa; BoidParticle *boid; - float timestep = 0.04f*psys->part->timetweak; + float timestep = 0.04f * psys->part->timetweak; if (index >= psys->totpart) return; @@ -333,7 +333,7 @@ static void ptcache_particle_interpolate(int index, void *psys_v, void **data, f ParticleSystem *psys= psys_v; ParticleData *pa; ParticleKey keys[4]; - float dfra, timestep = 0.04f*psys->part->timetweak; + float dfra, timestep = 0.04f * psys->part->timetweak; if (index >= psys->totpart) return; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 279c8e6bc61..34c08a917b3 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3340,7 +3340,7 @@ static void direct_link_texture(FileData *fd, Tex *tex) tex->env = newdataadr(fd, tex->env); if (tex->env) { tex->env->ima = NULL; - memset(tex->env->cube, 0, 6*sizeof(void *)); + memset(tex->env->cube, 0, 6 * sizeof(void *)); tex->env->ok= 0; } tex->pd = newdataadr(fd, tex->pd); diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index b821c9875db..a2510129df6 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -523,14 +523,14 @@ void BM_log_mesh_elems_reorder(BMesh *bm, BMLog *log) i = 0; varr = MEM_mallocN(sizeof(int) * bm->totvert, AT); BM_ITER_MESH (v, &bm_iter, bm, BM_VERTS_OF_MESH) { - ((unsigned int*)varr)[i++] = bm_log_vert_id_get(log, v); + ((unsigned int *)varr)[i++] = bm_log_vert_id_get(log, v); } /* Put all face IDs into an array */ i = 0; farr = MEM_mallocN(sizeof(int) * bm->totface, AT); BM_ITER_MESH (f, &bm_iter, bm, BM_FACES_OF_MESH) { - ((unsigned int*)farr)[i++] = bm_log_face_id_get(log, f); + ((unsigned int *)farr)[i++] = bm_log_face_id_get(log, f); } /* Create BMVert index remap array */ diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index c098d6da32b..5b0381f6443 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -58,7 +58,7 @@ private: * @brief The group node this node belongs to. * @note: used to find the links in the current subtree for muting nodes */ - bNode* m_bNodeGroup; + bNode *m_bNodeGroup; public: Node(bNode *editorNode, bool create_sockets = true); @@ -145,8 +145,8 @@ public: */ OutputSocket *findOutputSocketBybNodeSocket(bNodeSocket *socket); - inline void setbNodeGroup(bNode* group) {this->m_bNodeGroup = group;} - inline bNode* getbNodeGroup() {return this->m_bNodeGroup;} + inline void setbNodeGroup(bNode *group) {this->m_bNodeGroup = group;} + inline bNode *getbNodeGroup() {return this->m_bNodeGroup;} protected: void addPreviewOperation(ExecutionSystem *system, CompositorContext *context, InputSocket *inputSocket); void addPreviewOperation(ExecutionSystem *system, CompositorContext *context, OutputSocket *outputSocket); diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cpp b/source/blender/compositor/nodes/COM_PixelateNode.cpp index f1c7c616a30..b751c9a6e9f 100644 --- a/source/blender/compositor/nodes/COM_PixelateNode.cpp +++ b/source/blender/compositor/nodes/COM_PixelateNode.cpp @@ -36,8 +36,8 @@ void PixelateNode::convertToOperations(ExecutionSystem *graph, CompositorContext OutputSocket *outputSocket = this->getOutputSocket(0); DataType datatype = inputSocket->getDataType(); if (inputSocket->isConnected()) { - SocketConnection * connection = inputSocket->getConnection(); - OutputSocket* otherOutputSocket = connection->getFromSocket(); + SocketConnection *connection = inputSocket->getConnection(); + OutputSocket *otherOutputSocket = connection->getFromSocket(); datatype = otherOutputSocket->getDataType(); } diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index d0d631e14a5..41bbed8eb19 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1694,7 +1694,7 @@ void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers *v /* draw numbers in the appropriate range */ if (dfac > 0.0f) { - float h = 0.1f*UI_UNIT_Y + (float)(hor.ymin); + float h = 0.1f * UI_UNIT_Y + (float)(hor.ymin); for (; fac < hor.xmax - 0.5f * U.widget_unit; fac += dfac, val += grid->dx) { diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 590bcd5939e..5e1d954a2ea 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1320,7 +1320,7 @@ static void calc_ortho_extent(KnifeTool_OpData *kcd) { BMIter iter; BMVert *v; - BMesh* bm = kcd->em->bm; + BMesh *bm = kcd->em->bm; float max_xyz = 0.0f; int i; diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 78a8bd47668..5b5e5206e9c 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -5265,7 +5265,7 @@ static int createSlideVerts(TransInfo *t) if (dot_v3v3(loop_dir[l_nr], dir) < 0.0f) { swap_v3_v3(sv_array->upvec, sv_array->downvec); SWAP(BMVert, sv_array->vup, sv_array->vdown); - SWAP(BMVert*, sv_array->up, sv_array->down); + SWAP(BMVert *, sv_array->up, sv_array->down); } } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 12b0341d395..63eea8b8d4c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -127,30 +127,24 @@ static short constraints_list_needinv(TransInfo *t, ListBase *list); /* ************************** Functions *************************** */ -static int trans_data_compare_dist(const void *A, const void *B) +static int trans_data_compare_dist(const void *a, const void *b) { - const TransData *td_A = (const TransData*)A; - const TransData *td_B = (const TransData*)B; + const TransData *td_a = (const TransData *)a; + const TransData *td_b = (const TransData *)b; - if (td_A->dist < td_B->dist) - return -1; - else if (td_A->dist > td_B->dist) - return 1; - - return 0; + if (td_a->dist < td_b->dist) return -1; + else if (td_a->dist > td_b->dist) return 1; + else return 0; } -static int trans_data_compare_rdist(const void *A, const void *B) +static int trans_data_compare_rdist(const void *a, const void *b) { - const TransData *td_A = (const TransData*)A; - const TransData *td_B = (const TransData*)B; + const TransData *td_a = (const TransData *)a; + const TransData *td_b = (const TransData *)b; - if (td_A->rdist < td_B->rdist) - return -1; - else if (td_A->rdist > td_B->rdist) - return 1; - - return 0; + if (td_a->rdist < td_b->rdist) return -1; + else if (td_a->rdist > td_b->rdist) return 1; + else return 0; } void sort_trans_data_dist(TransInfo *t) diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c index f969e07384c..b1bb5c85e50 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.c +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c @@ -799,7 +799,7 @@ static void stitch_validate_edge_stichability(UvEdge *edge, StitchState *state, } -static void stitch_propagate_uv_final_position (UvElement *element, int index, PreviewPosition *preview_position, UVVertAverage *final_position, StitchState *state, char final, Scene* scene) +static void stitch_propagate_uv_final_position(UvElement *element, int index, PreviewPosition *preview_position, UVVertAverage *final_position, StitchState *state, char final, Scene *scene) { StitchPreviewer *preview = state->stitch_preview; @@ -1392,7 +1392,7 @@ static void stitch_switch_selection_mode(StitchState *state) if (state->mode == STITCH_VERT) { int i; - state->selection_stack = MEM_mallocN(state->total_separate_edges*sizeof(*state->selection_stack), + state->selection_stack = MEM_mallocN(state->total_separate_edges * sizeof(*state->selection_stack), "stitch_new_edge_selection_stack"); /* check if both elements of an edge are selected */ @@ -1415,7 +1415,7 @@ static void stitch_switch_selection_mode(StitchState *state) } else { int i; - state->selection_stack = MEM_mallocN(state->total_separate_uvs*sizeof(*state->selection_stack), + state->selection_stack = MEM_mallocN(state->total_separate_uvs * sizeof(*state->selection_stack), "stitch_new_vert_selection_stack"); for (i = 0; i < old_selection_size; i++) { diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h index f0864f06e6f..730a19d84fd 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.h +++ b/source/blender/imbuf/intern/dds/ColorBlock.h @@ -69,7 +69,7 @@ struct ColorBlock private: - Color32 m_color[4*4]; + Color32 m_color[4 * 4]; }; diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h index 72a524daba2..11e6d4a5708 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h @@ -172,7 +172,7 @@ public: void setUserVersion(int version); void mipmap(Image * img, uint f, uint m); - void* readData(uint &size); + void *readData(uint &size); // void mipmap(FloatImage * img, uint f, uint m); void printInfo() const; diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 21bd55e0137..9ce3b313c37 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -424,7 +424,7 @@ static void rna_ColorManagedViewSettings_view_transform_set(PointerRNA *ptr, int } } -static EnumPropertyItem* rna_ColorManagedViewSettings_view_transform_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) +static EnumPropertyItem *rna_ColorManagedViewSettings_view_transform_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { Scene *scene = CTX_data_scene(C); EnumPropertyItem *items = NULL; diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index b16f0d69fba..43ec09de010 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -66,7 +66,7 @@ typedef void (*ContextPropUpdateFunc)(struct bContext *C, struct PointerRNA *ptr typedef void (*ContextUpdateFunc)(struct bContext *C, struct PointerRNA *ptr); typedef int (*EditableFunc)(struct PointerRNA *ptr); typedef int (*ItemEditableFunc)(struct PointerRNA *ptr, int index); -typedef struct IDProperty* (*IDPropertiesFunc)(struct PointerRNA *ptr, int create); +typedef struct IDProperty *(*IDPropertiesFunc)(struct PointerRNA *ptr, int create); typedef struct StructRNA *(*StructRefineFunc)(struct PointerRNA *ptr); typedef char *(*StructPathFunc)(struct PointerRNA *ptr); @@ -93,7 +93,7 @@ typedef void (*PropEnumSetFunc)(struct PointerRNA *ptr, int value); typedef EnumPropertyItem *(*PropEnumItemFunc)(struct bContext *C, struct PointerRNA *ptr, struct PropertyRNA *prop, int *free); typedef PointerRNA (*PropPointerGetFunc)(struct PointerRNA *ptr); -typedef StructRNA* (*PropPointerTypeFunc)(struct PointerRNA *ptr); +typedef StructRNA *(*PropPointerTypeFunc)(struct PointerRNA *ptr); typedef void (*PropPointerSetFunc)(struct PointerRNA *ptr, const PointerRNA value); typedef int (*PropPointerPollFunc)(struct PointerRNA *ptr, const PointerRNA value); typedef void (*PropCollectionBeginFunc)(struct CollectionPropertyIterator *iter, struct PointerRNA *ptr); diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index ded35363287..32315195072 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -523,7 +523,7 @@ static int bpy_slot_from_py(BMesh *bm, BMOperator *bmop, BMOpSlot *slot, PyObjec * * \note Don't throw any exceptions and should always return a valid (PyObject *). */ -static PyObject* bpy_slot_to_py(BMesh *bm, BMOpSlot *slot) +static PyObject *bpy_slot_to_py(BMesh *bm, BMOpSlot *slot) { PyObject *item = NULL; diff --git a/source/blender/python/generic/bpy_internal_import.h b/source/blender/python/generic/bpy_internal_import.h index 1592ec52b4c..56cdf677ccb 100644 --- a/source/blender/python/generic/bpy_internal_import.h +++ b/source/blender/python/generic/bpy_internal_import.h @@ -48,9 +48,9 @@ struct Text; void bpy_import_init(PyObject *builtins); -PyObject* bpy_text_import(struct Text *text); -PyObject* bpy_text_import_name(const char *name, int *found); -PyObject* bpy_text_reimport(PyObject *module, int *found); +PyObject *bpy_text_import(struct Text *text); +PyObject *bpy_text_import_name(const char *name, int *found); +PyObject *bpy_text_reimport(PyObject *module, int *found); /* void bpy_text_clear_modules(int clear_all);*/ /* Clear user modules */ void bpy_text_filename_get(char *fn, size_t fn_len, struct Text *text); diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h index d773cdc8f3a..55323c05278 100644 --- a/source/blender/quicktime/quicktime_export.h +++ b/source/blender/quicktime/quicktime_export.h @@ -65,14 +65,14 @@ void filepath_qt(char *string, struct RenderData *rd); void quicktime_verify_image_type(struct RenderData *rd, struct ImageFormatData *imf); //used by RNA for defaults values init, if needed /*Video codec type*/ int quicktime_get_num_videocodecs(void); -QuicktimeCodecTypeDesc* quicktime_get_videocodecType_desc(int indexValue); +QuicktimeCodecTypeDesc *quicktime_get_videocodecType_desc(int indexValue); int quicktime_rnatmpvalue_from_videocodectype(int codecType); int quicktime_videocodecType_from_rnatmpvalue(int rnatmpvalue); #ifdef USE_QTKIT /*Audio codec type*/ int quicktime_get_num_audiocodecs(void); -QuicktimeCodecTypeDesc* quicktime_get_audiocodecType_desc(int indexValue); +QuicktimeCodecTypeDesc *quicktime_get_audiocodecType_desc(int indexValue); int quicktime_rnatmpvalue_from_audiocodectype(int codecType); int quicktime_audiocodecType_from_rnatmpvalue(int rnatmpvalue); #endif diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index eee4b5a3a57..eb1aad75a88 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -204,9 +204,9 @@ void WM_operator_stack_clear(struct wmWindowManager *wm); struct wmOperatorType *WM_operatortype_find(const char *idnamem, int quiet); struct GHashIterator *WM_operatortype_iter(void); -void WM_operatortype_append (void (*opfunc)(struct wmOperatorType*)); -void WM_operatortype_append_ptr (void (*opfunc)(struct wmOperatorType*, void *), void *userdata); -void WM_operatortype_append_macro_ptr (void (*opfunc)(struct wmOperatorType*, void *), void *userdata); +void WM_operatortype_append(void (*opfunc)(struct wmOperatorType *)); +void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType *, void *), void *userdata); +void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType *, void *), void *userdata); int WM_operatortype_remove(const char *idname); struct wmOperatorType *WM_operatortype_append_macro(const char *idname, const char *name, const char *description, int flag); |