Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang-format

Browse Source
This commit is contained in:
Campbell Barton
2020-06-01 15:04:30 +10:00
parent c71be9a552
commit 81c33f0ba7
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/build_environment/cmake/openimageio.cmake
View File

@@ -155,4 +155,3 @@ if(WIN32)
) )
endif() endif()
endif() endif()

7
source/blender/blenkernel/intern/seqprefetch.c
View File

@@ -435,11 +435,8 @@ static void *seq_prefetch_frames(void *job)
seq_prefetch_update_depsgraph(pfjob); seq_prefetch_update_depsgraph(pfjob);
AnimData *adt = BKE_animdata_from_id(&pfjob->context_cpy.scene->id); AnimData *adt = BKE_animdata_from_id(&pfjob->context_cpy.scene->id);
BKE_animsys_evaluate_animdata(&pfjob->context_cpy.scene->id, BKE_animsys_evaluate_animdata(
adt, &pfjob->context_cpy.scene->id, adt, seq_prefetch_cfra(pfjob), ADT_RECALC_ALL, false);
seq_prefetch_cfra(pfjob),
ADT_RECALC_ALL,
false);
/* This is quite hacky solution: /* This is quite hacky solution:
* We need cross-reference original scene with copy for cache. * We need cross-reference original scene with copy for cache.

21
source/blender/editors/transform/transform_orientations.c
View File

@@ -562,16 +562,17 @@ short transform_orientation_matrix_get(bContext *C,
orientation_index_custom = orientation - V3D_ORIENT_CUSTOM; orientation_index_custom = orientation - V3D_ORIENT_CUSTOM;
} }
return ED_transform_calc_orientation_from_type_ex(C, return ED_transform_calc_orientation_from_type_ex(
r_spacemtx, C,
/* extra args (can be accessed from context) */ r_spacemtx,
t->scene, /* extra args (can be accessed from context) */
rv3d, t->scene,
ob, rv3d,
obedit, ob,
orientation, obedit,
orientation_index_custom, orientation,
t->around); orientation_index_custom,
t->around);
} }
unit_m3(r_spacemtx); unit_m3(r_spacemtx);

2
source/blender/windowmanager/intern/wm_cursors.c
View File

@@ -150,7 +150,7 @@ void WM_cursor_set(wmWindow *win, int curs)
} }
if (win->cursor == curs) { if (win->cursor == curs) {
return; /* Cursor is already set */ return; /* Cursor is already set */
} }
win->cursor = curs; win->cursor = curs;