archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2016-02-02 11:56:30 +11:00
parent a92bdfe0c9
commit 883a20c8e7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/image.c
View File

@@ -1906,7 +1906,7 @@ static void stampdata_from_template(StampData *stamp_data,
else { else {
stamp_data->frame[0] = '\0'; stamp_data->frame[0] = '\0';
} }
if(scene->r.stamp & R_STAMP_CAMERA) { if (scene->r.stamp & R_STAMP_CAMERA) {
BLI_snprintf(stamp_data->camera, sizeof(stamp_data->camera), "Camera %s", stamp_data_template->camera); BLI_snprintf(stamp_data->camera, sizeof(stamp_data->camera), "Camera %s", stamp_data_template->camera);
} }
else { else {
@@ -1925,7 +1925,7 @@ static void stampdata_from_template(StampData *stamp_data,
stamp_data->scene[0] = '\0'; stamp_data->scene[0] = '\0';
} }
if (scene->r.stamp & R_STAMP_SEQSTRIP) { if (scene->r.stamp & R_STAMP_SEQSTRIP) {
BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), "Strip %s" , stamp_data_template->strip); BLI_snprintf(stamp_data->strip, sizeof(stamp_data->strip), "Strip %s", stamp_data_template->strip);
} }
else { else {
stamp_data->strip[0] = '\0'; stamp_data->strip[0] = '\0';

14
source/blender/editors/armature/armature_select.c
View File

@@ -863,10 +863,10 @@ static void select_similar_suffix(bArmature *arm, EditBone *ebone_act)
static void is_ancestor(EditBone * bone, EditBone * ancestor) static void is_ancestor(EditBone * bone, EditBone * ancestor)
{ {
if(bone->temp.ebone == ancestor || bone->temp.ebone == NULL) if (bone->temp.ebone == ancestor || bone->temp.ebone == NULL)
return; return;
if(bone->temp.ebone->temp.ebone != NULL && bone->temp.ebone->temp.ebone != ancestor) if (bone->temp.ebone->temp.ebone != NULL && bone->temp.ebone->temp.ebone != ancestor)
is_ancestor(bone->temp.ebone, ancestor); is_ancestor(bone->temp.ebone, ancestor);
bone->temp.ebone = bone->temp.ebone->temp.ebone; bone->temp.ebone = bone->temp.ebone->temp.ebone;
@@ -880,10 +880,10 @@ static void select_similar_children(bArmature *arm, EditBone *ebone_act)
ebone_iter->temp.ebone = ebone_iter->parent; ebone_iter->temp.ebone = ebone_iter->parent;
} }
for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next){ for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) {
is_ancestor(ebone_iter, ebone_act); is_ancestor(ebone_iter, ebone_act);
if(ebone_iter->temp.ebone == ebone_act && EBONE_SELECTABLE(arm, ebone_iter)) if (ebone_iter->temp.ebone == ebone_act && EBONE_SELECTABLE(arm, ebone_iter))
ED_armature_ebone_select_set(ebone_iter, true); ED_armature_ebone_select_set(ebone_iter, true);
} }
} }
@@ -892,7 +892,7 @@ static void select_similar_children_immediate(bArmature *arm, EditBone *ebone_ac
{ {
EditBone *ebone_iter; EditBone *ebone_iter;
for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) { for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) {
if(ebone_iter->parent == ebone_act && EBONE_SELECTABLE(arm, ebone_iter)) { if (ebone_iter->parent == ebone_act && EBONE_SELECTABLE(arm, ebone_iter)) {
ED_armature_ebone_select_set(ebone_iter, true); ED_armature_ebone_select_set(ebone_iter, true);
} }
} }
@@ -902,11 +902,11 @@ static void select_similar_siblings(bArmature *arm, EditBone *ebone_act)
{ {
EditBone *ebone_iter; EditBone *ebone_iter;
if(ebone_act->parent == NULL) if (ebone_act->parent == NULL)
return; return;
for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) { for (ebone_iter = arm->edbo->first; ebone_iter; ebone_iter = ebone_iter->next) {
if(ebone_iter->parent == ebone_act->parent && EBONE_SELECTABLE(arm, ebone_iter)) { if (ebone_iter->parent == ebone_act->parent && EBONE_SELECTABLE(arm, ebone_iter)) {
ED_armature_ebone_select_set(ebone_iter, true); ED_armature_ebone_select_set(ebone_iter, true);
} }
} }