blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: style

This commit is contained in:
Campbell Barton 2018-12-07 20:48:49 +11:00
parent 20261a7581
commit b48156d012
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/armature.c
View File

@ -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,

3
source/blender/blenkernel/intern/studiolight.c
View File

@ -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);

8
source/blender/collada/BCAnimationCurve.cpp
View File

@ -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;

2
source/blender/collada/BCAnimationSampler.h
View File

@ -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<int> &frames) const;
const int get_frames(Object *ob, BCFrames &frames) const;

2
source/blender/collada/collada_utils.cpp
View File

@ -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<std::string, bNode *> 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");

2
source/blender/editors/transform/transform_snap_object.c
View File

@ -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);