Cleanup: whitespace
This commit is contained in:
parent
3895c1e57e
commit
e5604a2fa4
|
@ -643,7 +643,7 @@ bool BKE_id_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int flag, con
|
|||
}
|
||||
|
||||
/* Update ID refcount, remap pointers to self in new ID. */
|
||||
struct IDCopyLibManagementData data = {.id_src=id, .flag=flag};
|
||||
struct IDCopyLibManagementData data = {.id_src = id, .flag = flag};
|
||||
BKE_library_foreach_ID_link(bmain, *r_newid, id_copy_libmanagement_cb, &data, IDWALK_NOP);
|
||||
|
||||
/* Do not make new copy local in case we are copying outside of main...
|
||||
|
|
|
@ -330,14 +330,14 @@ void BKE_object_free_derived_caches(Object *ob)
|
|||
Mesh *me = ob->data;
|
||||
|
||||
if (me && me->bb) {
|
||||
atomic_fetch_and_or_uint32((uint*)&me->bb->flag, BOUNDBOX_DIRTY);
|
||||
atomic_fetch_and_or_uint32((uint *)&me->bb->flag, BOUNDBOX_DIRTY);
|
||||
}
|
||||
}
|
||||
else if (ELEM(ob->type, OB_SURF, OB_CURVE, OB_FONT)) {
|
||||
Curve *cu = ob->data;
|
||||
|
||||
if (cu && cu->bb) {
|
||||
atomic_fetch_and_or_uint32((uint*)&cu->bb->flag, BOUNDBOX_DIRTY);
|
||||
atomic_fetch_and_or_uint32((uint *)&cu->bb->flag, BOUNDBOX_DIRTY);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -312,7 +312,7 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
|
|||
|
||||
int num_total_tracks = BLI_listbase_count(tracksbase);
|
||||
context->tracks =
|
||||
MEM_callocN(sizeof(MovieTrackingTrack*) * num_total_tracks,
|
||||
MEM_callocN(sizeof(MovieTrackingTrack *) * num_total_tracks,
|
||||
"auto track pointers");
|
||||
|
||||
context->image_accessor =
|
||||
|
|
|
@ -481,7 +481,8 @@ VFontData *BLI_vfontdata_from_freetypefont(PackedFile *pf)
|
|||
return vfd;
|
||||
}
|
||||
|
||||
static void *vfontdata_copy_characters_value_cb(const void *src) {
|
||||
static void *vfontdata_copy_characters_value_cb(const void *src)
|
||||
{
|
||||
return BLI_vfontchar_copy(src, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -452,7 +452,8 @@ static int make(const char *input_file_name, const char *output_file_name)
|
|||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
if (argc != 3) {
|
||||
printf("Usage: %s <input.po> <output.mo>\n", argv[0]);
|
||||
return EXIT_FAILURE;
|
||||
|
|
|
@ -6795,8 +6795,8 @@ static bool ui_but_menu(bContext *C, uiBut *but)
|
|||
/* set the prop and pointer data for python access to the hovered ui element; TODO, index could be supported as well*/
|
||||
PointerRNA temp_ptr;
|
||||
RNA_pointer_create(NULL, &RNA_Property, but->rnaprop, &temp_ptr);
|
||||
uiLayoutSetContextPointer(layout,"button_prop", &temp_ptr);
|
||||
uiLayoutSetContextPointer(layout,"button_pointer", ptr);
|
||||
uiLayoutSetContextPointer(layout, "button_prop", &temp_ptr);
|
||||
uiLayoutSetContextPointer(layout, "button_pointer", ptr);
|
||||
|
||||
/* second slower test, saved people finding keyframe items in menus when its not possible */
|
||||
if (is_anim)
|
||||
|
@ -7015,8 +7015,9 @@ static bool ui_but_menu(bContext *C, uiBut *but)
|
|||
}
|
||||
|
||||
/* Set the operator pointer for python access */
|
||||
if (but->opptr)
|
||||
uiLayoutSetContextPointer(layout,"button_operator", but->opptr);
|
||||
if (but->opptr) {
|
||||
uiLayoutSetContextPointer(layout, "button_operator", but->opptr);
|
||||
}
|
||||
|
||||
uiItemS(layout);
|
||||
}
|
||||
|
|
|
@ -168,8 +168,8 @@ static void iter_snap_objects(
|
|||
for (Base *base = sctx->scene->base.first; base != NULL; base = base->next) {
|
||||
if ((BASE_VISIBLE_BGMODE(sctx->v3d_data.v3d, sctx->scene, base)) &&
|
||||
(base->flag & (BA_HAS_RECALC_OB | BA_HAS_RECALC_DATA)) == 0 &&
|
||||
!((snap_select == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL))) ||
|
||||
(snap_select == SNAP_NOT_ACTIVE && base == base_act)))
|
||||
!((snap_select == SNAP_NOT_SELECTED && (base->flag & (SELECT | BA_WAS_SEL))) ||
|
||||
(snap_select == SNAP_NOT_ACTIVE && base == base_act)))
|
||||
{
|
||||
bool use_obedit;
|
||||
Object *obj = base->object;
|
||||
|
@ -405,7 +405,7 @@ static bool raycastDerivedMesh(
|
|||
if (bb) {
|
||||
/* was BKE_boundbox_ray_hit_check, see: cf6ca226fa58 */
|
||||
if (!isect_ray_aabb_v3_simple(
|
||||
ray_start_local, ray_normal_local, bb->vec[0], bb->vec[6], &len_diff, NULL))
|
||||
ray_start_local, ray_normal_local, bb->vec[0], bb->vec[6], &len_diff, NULL))
|
||||
{
|
||||
return retval;
|
||||
}
|
||||
|
@ -474,8 +474,7 @@ static bool raycastDerivedMesh(
|
|||
if (len_diff == 0.0f) { /* do_ray_start_correction */
|
||||
/* We *need* a reasonably valid len_diff in this case.
|
||||
* Get the distance to bvhtree root */
|
||||
if (!isect_ray_bvhroot_v3(treedata->tree, ray_start_local, ray_normal_local, &len_diff))
|
||||
{
|
||||
if (!isect_ray_bvhroot_v3(treedata->tree, ray_start_local, ray_normal_local, &len_diff)) {
|
||||
return retval;
|
||||
}
|
||||
}
|
||||
|
@ -517,8 +516,8 @@ static bool raycastDerivedMesh(
|
|||
BVHTreeRayHit hit = {.index = -1, .dist = local_depth};
|
||||
|
||||
if (BLI_bvhtree_ray_cast(
|
||||
treedata->tree, ray_start_local, ray_normal_local, 0.0f,
|
||||
&hit, treedata->raycast_callback, treedata) != -1)
|
||||
treedata->tree, ray_start_local, ray_normal_local, 0.0f,
|
||||
&hit, treedata->raycast_callback, treedata) != -1)
|
||||
{
|
||||
hit.dist += len_diff;
|
||||
hit.dist /= local_scale;
|
||||
|
@ -631,8 +630,7 @@ static bool raycastEditMesh(
|
|||
if (sctx->use_v3d && !((RegionView3D *)sctx->v3d_data.ar->regiondata)->is_persp) { /* do_ray_start_correction */
|
||||
/* We *need* a reasonably valid len_diff in this case.
|
||||
* Get the distance to bvhtree root */
|
||||
if (!isect_ray_bvhroot_v3(treedata->tree, ray_start_local, ray_normal_local, &len_diff))
|
||||
{
|
||||
if (!isect_ray_bvhroot_v3(treedata->tree, ray_start_local, ray_normal_local, &len_diff)) {
|
||||
return retval;
|
||||
}
|
||||
/* You need to make sure that ray_start is really far away,
|
||||
|
|
|
@ -146,7 +146,7 @@ bool MOD_meshcache_read_pc2_index(FILE *fp,
|
|||
return false;
|
||||
}
|
||||
|
||||
if (fseek(fp, sizeof(float) * 3 * index * pc2_head.verts_tot , SEEK_CUR) != 0) {
|
||||
if (fseek(fp, sizeof(float) * 3 * index * pc2_head.verts_tot, SEEK_CUR) != 0) {
|
||||
*err_str = "Failed to seek frame";
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue