From a744fed46c1378d5aa6996bf0be5421c0a1c27d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 20 Jun 2012 16:43:48 +0000 Subject: style cleanup --- source/blender/blenkernel/intern/boids.c | 3 ++- source/blender/blenkernel/intern/object.c | 3 ++- source/blender/collada/MaterialExporter.cpp | 4 +++- source/blender/collada/SkinInfo.cpp | 4 +++- source/blender/collada/TransformReader.cpp | 4 +++- source/blender/collada/collada_internal.cpp | 4 +++- source/blender/collada/collada_utils.cpp | 3 ++- source/blender/compositor/intern/COM_NodeOperation.cpp | 6 ++++-- source/blender/compositor/operations/COM_WriteBufferOperation.cpp | 3 ++- source/blender/editors/space_file/file_ops.c | 3 ++- source/blender/gpu/intern/gpu_draw.c | 3 ++- source/blender/imbuf/intern/jp2.c | 2 +- source/blender/makesrna/intern/rna_userdef.c | 3 ++- source/gameengine/GameLogic/SCA_PythonController.cpp | 2 +- 14 files changed, 32 insertions(+), 15 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index 014b3f5e40b..edb3120cf87 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -920,7 +920,8 @@ static BoidState *get_boid_state(BoidSettings *boids, ParticleData *pa) return state; } -//static int boid_condition_is_true(BoidCondition *cond) { +//static int boid_condition_is_true(BoidCondition *cond) +//{ // /* TODO */ // return 0; //} diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1f5ba8ae305..5c48b35c85a 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3101,7 +3101,8 @@ static Object *obrel_armature_find(Object *ob) return ob_arm; } -static int obrel_is_recursive_child(Object *ob, Object *child) { +static int obrel_is_recursive_child(Object *ob, Object *child) +{ Object *par; for (par = child->parent; par; par = par->parent) { if (par == ob) { diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp index 07e11183dd0..5a1d8b7602a 100644 --- a/source/blender/collada/MaterialExporter.cpp +++ b/source/blender/collada/MaterialExporter.cpp @@ -31,7 +31,9 @@ #include "COLLADABUUtils.h" #include "collada_internal.h" -MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings) { +MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings) +{ + /* pass */ } void MaterialsExporter::exportMaterials(Scene *sce) diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index 0116f89361b..9b0d59d66ea 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -57,7 +57,9 @@ static const char *bc_get_joint_name(T *node) // This is used to store data passed in write_controller_data. // Arrays from COLLADAFW::SkinControllerData lose ownership, so do this class members // so that arrays don't get freed until we free them explicitly. -SkinInfo::SkinInfo() { +SkinInfo::SkinInfo() +{ + /* pass */ } SkinInfo::SkinInfo(const SkinInfo& skin) : weights(skin.weights), diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp index be615f83787..d10cd7378e9 100644 --- a/source/blender/collada/TransformReader.cpp +++ b/source/blender/collada/TransformReader.cpp @@ -29,7 +29,9 @@ #include "TransformReader.h" -TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv) { +TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv) +{ + /* pass */ } void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::map *animation_map, Object *ob) diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 0ee8419eda7..a4969735757 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -31,7 +31,9 @@ #include "BLI_linklist.h" -UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) { +UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) +{ + /* pass */ } void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset) diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index cf7c9e49b63..62ae5d38727 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -260,7 +260,8 @@ void bc_bubble_sort_by_Object_name(LinkNode *export_set) * can be root bones. Otherwise the top most deform bones in the hierarchy * are root bones. */ -bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) { +bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) +{ if (deform_bones_only) { Bone *root = NULL; Bone *bone = aBone; diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp index f416be5dedf..d439f5b77fe 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.cpp +++ b/source/blender/compositor/intern/COM_NodeOperation.cpp @@ -194,7 +194,8 @@ void NodeOperation::COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel ke if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); } } -void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer) { +void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer) +{ cl_int error; const size_t size[] = {outputMemoryBuffer->getWidth(), outputMemoryBuffer->getHeight()}; @@ -202,7 +203,8 @@ void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); } } -void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex) { +void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex) +{ cl_int error; const int width = outputMemoryBuffer->getWidth(); const int height = outputMemoryBuffer->getHeight(); diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index e1018e0d037..4fff3fdcc31 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -175,7 +175,8 @@ void WriteBufferOperation::executeOpenCLRegion(cl_context context, cl_program pr delete clKernelsToCleanUp; } -void WriteBufferOperation::readResolutionFromInputSocket() { +void WriteBufferOperation::readResolutionFromInputSocket() +{ NodeOperation *inputOperation = this->getInputOperation(0); this->setWidth(inputOperation->getWidth()); this->setHeight(inputOperation->getHeight()); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index e2fc1b64223..0cf3586e659 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1277,7 +1277,8 @@ void FILE_OT_hidedot(struct wmOperatorType *ot) ot->poll = ED_operator_file_active; /* <- important, handler is on window level */ } -struct ARegion *file_buttons_region(struct ScrArea *sa){ +struct ARegion *file_buttons_region(struct ScrArea *sa) +{ ARegion *ar, *arnew; for (ar = sa->regionbase.first; ar; ar = ar->next) diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index e718a486561..4197e1a3edb 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -240,7 +240,8 @@ static struct GPUTextureState { /* Mipmap settings */ -void GPU_set_gpu_mipmapping(int gpu_mipmap){ +void GPU_set_gpu_mipmapping(int gpu_mipmap) +{ int old_value = GTS.gpu_mipmap; /* only actually enable if it's supported */ diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index a5826634724..053d88c8c32 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -332,7 +332,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags) return(ibuf); } -//static opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp) { +//static opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp) /* prec can be 8, 12, 16 */ /* use inline because the float passed can be a function call that would end up being called many times */ diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 42eb06b137a..f4cb4fc58f4 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -144,7 +144,8 @@ static void rna_userdef_anisotropic_update(Main *bmain, Scene *scene, PointerRNA rna_userdef_update(bmain, scene, ptr); } -static void rna_userdef_gl_gpu_mipmaps(Main *bmain, Scene *scene, PointerRNA *ptr) { +static void rna_userdef_gl_gpu_mipmaps(Main *bmain, Scene *scene, PointerRNA *ptr) +{ GPU_set_gpu_mipmapping(U.use_gpu_mipmap); rna_userdef_update(bmain, scene, ptr); } diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 9c8e6fe99b4..94a8628ca79 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -209,7 +209,7 @@ SCA_IActuator* SCA_PythonController::LinkedActuatorFromPy(PyObject *value) else if (PyObject_TypeCheck(value, &SCA_IActuator::Type)) { PyObjectPlus *value_plus= BGE_PROXY_REF(value); for (it = lacts.begin(); it!= lacts.end(); ++it) { - if ( static_cast(value_plus) == (*it) ) { + if (static_cast(value_plus) == (*it)) { return *it; } } -- cgit v1.2.3