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

Code cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2014-06-06 07:54:05 +10:00
parent 98bf3959b4
commit ae4ed68dfe
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_WindowCocoa.mm
View File

@@ -733,7 +733,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
//now has proper multi-monitor support for fullscreen
struct utsname retval;
uname(&retval);
if(retval.release[0] == '1' && retval.release[1] <= '3') {
if (retval.release[0] == '1' && retval.release[1] <= '3') {
m_lionStyleFullScreen = true;
}

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

@@ -1428,7 +1428,7 @@ static void calc_bevfac_mapping(
bevp_prev = (BevPoint *)(bl + 1);
bevp = bevp_prev + 1;
if (nu->type == CU_BEZIER){
if (nu->type == CU_BEZIER) {
bezt_prev = nu->bezt;
bezt = bezt_prev + 1;
for (i = 0, bevp_i = 0; i < segcount; i++, bezt_prev++, bezt++) {
@@ -1441,7 +1441,7 @@ static void calc_bevfac_mapping(
bevp_prev = bevp++;
}
else {
for (j = 0; j < resolu; j++, bevp_prev = bevp++){
for (j = 0; j < resolu; j++, bevp_prev = bevp++) {
l = len_v3v3(bevp->vec, bevp_prev->vec);
seglen += l;
BLI_assert(bevp_i < bl->nr - 1);

2
source/blender/editors/animation/anim_channels_edit.c
View File

@@ -841,7 +841,7 @@ static void rearrange_animchannel_add_to_islands(ListBase *islands, ListBase *sr
(is_sel == 0) ||
/* 4) hidden status changes */
((island->flag & REORDER_ISLAND_HIDDEN) != is_hidden)
)
)
{
/* create a new island now */
island = MEM_callocN(sizeof(tReorderChannelIsland), "tReorderChannelIsland");

9
source/blender/editors/object/object_bake_api.c
View File

@@ -299,7 +299,7 @@ static bool bake_object_check(Object *ob, ReportList *reports)
BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is not a mesh", ob->id.name + 2);
return false;
}
else {
else {
Mesh *me = (Mesh *)ob->data;
const int pidx = CustomData_get_active_layer_index(&me->pdata, CD_MTEXPOLY);
@@ -774,11 +774,12 @@ static int bake(
/* make sure low poly renders */
ob_low->restrictflag &= ~OB_RESTRICT_RENDER;
if (RE_bake_has_engine(re))
if (RE_bake_has_engine(re)) {
ok = RE_bake_engine(re, ob_low, pixel_array_low, num_pixels, depth, pass_type, result);
}
else {
BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
goto cleanup;
BKE_report(reports, RPT_ERROR, "Current render engine does not support baking");
goto cleanup;
}
}

3
source/blender/editors/render/render_shading.c
View File

@@ -450,7 +450,8 @@ static int new_texture_exec(bContext *C, wmOperator *UNUSED(op))
tex->id.us--;
if (ptr.id.data && GS(((ID *)ptr.id.data)->name) == ID_MA &&
RNA_property_pointer_get(&ptr, prop).id.data == NULL) {
RNA_property_pointer_get(&ptr, prop).id.data == NULL)
{
/* In case we are assigning new texture to a material, and active slot was empty, reset 'use' flag. */
Material *ma = (Material *)ptr.id.data;
ma->septex &= ~(1 << ma->texact);

2
source/blender/editors/uvedit/uvedit_draw.c
View File

@@ -430,7 +430,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage)
for (a = me->totpoly; a != 0; a--, mpoly++) {
const int mat_nr = mpoly->mat_nr;
if ((mat_nr >= ob->totcol) ||
(BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0)
(BLI_BITMAP_GET(mat_test_array, mat_nr)) == 0)
{
continue;
}