From b48156d0122518541df58568c426ba21670a710f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Dec 2018 20:48:49 +1100 Subject: Cleanup: style --- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/studiolight.c | 3 ++- source/blender/collada/BCAnimationCurve.cpp | 8 ++++---- source/blender/collada/BCAnimationSampler.h | 2 +- source/blender/collada/collada_utils.cpp | 2 +- source/blender/editors/transform/transform_snap_object.c | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 8c32bed4a3b..de4f89fe146 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1168,7 +1168,7 @@ void armature_deform_verts( * * TODO(sergey): Make this code robust somehow when there are dependency * cycles involved. */ - ObjectBBoneDeform * bbone_deform = + ObjectBBoneDeform *bbone_deform = BKE_armature_cached_bbone_deformation_get(armOb); if (bbone_deform == NULL || bbone_deform->pdef_info_array == NULL) { fprintf(stderr, diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index bd8061a2d8e..070b94e35a9 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -1187,7 +1187,8 @@ static void studiolight_irradiance_preview(uint *icon_buffer, StudioLight *sl) void BKE_studiolight_init(void) { /* Add default studio light */ - StudioLight * sl = studiolight_create(STUDIOLIGHT_INTERNAL | STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED | STUDIOLIGHT_TYPE_STUDIO); + StudioLight *sl = studiolight_create( + STUDIOLIGHT_INTERNAL | STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED | STUDIOLIGHT_TYPE_STUDIO); BLI_strncpy(sl->name, "Default", FILE_MAXFILE); copy_v4_fl4(sl->light_ambient, 0.025000, 0.025000, 0.025000, 1.000000); diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp index 87cf07cc21c..74d852ae980 100644 --- a/source/blender/collada/BCAnimationCurve.cpp +++ b/source/blender/collada/BCAnimationCurve.cpp @@ -69,7 +69,7 @@ void BCAnimationCurve::init_pointer_rna(Object *ob) switch (this->curve_key.get_animation_type()) { case BC_ANIMATION_TYPE_BONE: { - bArmature * arm = (bArmature *)ob->data; + bArmature *arm = (bArmature *)ob->data; RNA_id_pointer_create(&arm->id, &id_ptr); } break; @@ -86,13 +86,13 @@ void BCAnimationCurve::init_pointer_rna(Object *ob) break; case BC_ANIMATION_TYPE_CAMERA: { - Camera * camera = (Camera *)ob->data; + Camera *camera = (Camera *)ob->data; RNA_id_pointer_create(&camera->id, &id_ptr); } break; case BC_ANIMATION_TYPE_LIGHT: { - Lamp * lamp = (Lamp *)ob->data; + Lamp *lamp = (Lamp *)ob->data; RNA_id_pointer_create(&lamp->id, &id_ptr); } break; @@ -188,7 +188,7 @@ const std::string BCAnimationCurve::get_animation_name(Object *ob) const case BC_ANIMATION_TYPE_MATERIAL: { - Material * ma = give_current_material(ob, this->curve_key.get_subindex() + 1); + Material *ma = give_current_material(ob, this->curve_key.get_subindex() + 1); name = id_name(ob) + "-" + id_name(ma) + "-material"; } break; diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/collada/BCAnimationSampler.h index 8bf2967a44f..ae0a04a706c 100644 --- a/source/blender/collada/BCAnimationSampler.h +++ b/source/blender/collada/BCAnimationSampler.h @@ -150,7 +150,7 @@ public: } BCSample &add(Object *ob, int frame_index); - BCSampleFrame * get_frame(int frame_index); // returns NULL if frame does not exist + BCSampleFrame *get_frame(int frame_index); // returns NULL if frame does not exist const int get_frames(std::vector &frames) const; const int get_frames(Object *ob, BCFrames &frames) const; diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 33f74968782..c7aed84986d 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -1314,7 +1314,7 @@ static bNodeSocket *bc_group_add_output_socket(bNodeTree *ntree, bNode *from_nod void bc_make_group(bContext *C, bNodeTree *ntree, std::map nmap) { - bNode * gnode = node_group_make_from_selected(C, ntree, "ShaderNodeGroup", "ShaderNodeTree"); + bNode *gnode = node_group_make_from_selected(C, ntree, "ShaderNodeGroup", "ShaderNodeTree"); bNodeTree *gtree = (bNodeTree *)gnode->id; bc_group_add_input_socket(gtree, nmap["main"], 0, "Diffuse"); diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 5a54e4153cb..64facb19f09 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -162,7 +162,7 @@ static void bm_mesh_minmax(BMesh *bm, float r_min[3], float r_max[3]) { INIT_MINMAX(r_min, r_max); BMIter iter; - BMVert * v; + BMVert *v; BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) { minmax_v3v3_v3(r_min, r_max, v->co); -- cgit v1.2.3