diff options
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 14 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/listbase.c | 2 | ||||
| -rw-r--r-- | source/blender/compositor/operations/COM_ZCombineOperation.cpp | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_2d.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index fd8ae34192a..fdca7ff0b27 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -2448,7 +2448,7 @@ static MovieTrackingMarker *tracking_context_get_keyframed_marker(MovieTrackingT /* Get image buffer for previous marker's keyframe. */ static ImBuf *tracking_context_get_keyframed_ibuf(MovieClip *clip, MovieClipUser *user, int clip_flag, - MovieTrackingTrack *track, int curfra, bool backwards, + MovieTrackingTrack *track, int curfra, bool backwards, MovieTrackingMarker **marker_keyed_r) { MovieTrackingMarker *marker_keyed; @@ -2464,7 +2464,7 @@ static ImBuf *tracking_context_get_keyframed_ibuf(MovieClip *clip, MovieClipUser /* Get image buffer which si used as referece for track. */ static ImBuf *tracking_context_get_reference_ibuf(MovieClip *clip, MovieClipUser *user, int clip_flag, - MovieTrackingTrack *track, int curfra, bool backwards, + MovieTrackingTrack *track, int curfra, bool backwards, MovieTrackingMarker **reference_marker) { ImBuf *ibuf = NULL; @@ -2496,7 +2496,7 @@ static bool track_context_update_reference(MovieTrackingContext *context, TrackC /* calculate patch for keyframed position */ reference_ibuf = tracking_context_get_reference_ibuf(context->clip, &context->user, context->clip_flag, - track, curfra, context->backwards, &reference_marker); + track, curfra, context->backwards, &reference_marker); if (!reference_ibuf) return false; @@ -2641,8 +2641,8 @@ static void tracking_insert_new_marker(MovieTrackingContext *context, MovieTrack * to dst_pixel_x and dst_pixel_y. */ static bool configure_and_run_tracker(ImBuf *destination_ibuf, MovieTrackingTrack *track, - MovieTrackingMarker *reference_marker, MovieTrackingMarker *marker, - float *reference_search_area, int reference_search_area_width, + MovieTrackingMarker *reference_marker, MovieTrackingMarker *marker, + float *reference_search_area, int reference_search_area_width, int reference_search_area_height, float *mask, double dst_pixel_x[5], double dst_pixel_y[5]) { @@ -2686,8 +2686,8 @@ static bool configure_and_run_tracker(ImBuf *destination_ibuf, MovieTrackingTrac reference_search_area_width, reference_search_area_height, patch_new, - new_search_area_width, - new_search_area_height, + new_search_area_width, + new_search_area_height, src_pixel_x, src_pixel_y, &result, dst_pixel_x, dst_pixel_y); diff --git a/source/blender/blenlib/intern/listbase.c b/source/blender/blenlib/intern/listbase.c index c5b10de3ff2..8f3d60517ad 100644 --- a/source/blender/blenlib/intern/listbase.c +++ b/source/blender/blenlib/intern/listbase.c @@ -584,7 +584,7 @@ void BLI_reverselist(ListBase *lb) struct Link *curr = lb->first; struct Link *prev = NULL; struct Link *next = NULL; - while(curr) { + while (curr) { next = curr->next; curr->next = prev; curr->prev = next; diff --git a/source/blender/compositor/operations/COM_ZCombineOperation.cpp b/source/blender/compositor/operations/COM_ZCombineOperation.cpp index 10090294a54..7db91a40fb7 100644 --- a/source/blender/compositor/operations/COM_ZCombineOperation.cpp +++ b/source/blender/compositor/operations/COM_ZCombineOperation.cpp @@ -136,7 +136,7 @@ void ZCombineMaskAlphaOperation::executePixel(float output[4], float x, float y, this->m_image1Reader->read(color1, x, y, sampler); this->m_image2Reader->read(color2, x, y, sampler); - float fac = (1.0f - mask[0])*(1.0f - color1[3]) + mask[0]*color2[3]; + float fac = (1.0f - mask[0]) * (1.0f - color1[3]) + mask[0] * color2[3]; float mfac = 1.0f - fac; output[0] = color1[0] * mfac + color2[0] * fac; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 3009cd0e758..1a4e0361018 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -459,7 +459,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) glEnable(GL_BLEND); glColor4f(drand48(), drand48(), drand48(), 0.1f); glRectf(ar->drawrct.xmin - ar->winrct.xmin, ar->drawrct.ymin - ar->winrct.ymin, - ar->drawrct.xmax - ar->winrct.xmin, ar->drawrct.ymax - ar->winrct.ymin); + ar->drawrct.xmax - ar->winrct.xmin, ar->drawrct.ymax - ar->winrct.ymin); glDisable(GL_BLEND); #endif diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 55dd96eff36..48a23641bdb 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -224,7 +224,7 @@ static unsigned short *brush_painter_mask_new(BrushPainter *painter, int size) unsigned short *mask, *m; int x, y; - mask = MEM_callocN(sizeof(unsigned short)*size*size, "brush_painter_mask"); + mask = MEM_callocN(sizeof(unsigned short) * size * size, "brush_painter_mask"); m = mask; for (y = 0; y < size; y++) { @@ -602,7 +602,7 @@ static void brush_painter_2d_refresh_cache(ImagePaintState *s, BrushPainter *pai do_partial_update = true; brush_painter_2d_tex_mapping(s, size, painter->startpaintpos, - pos, brush->mask_mtex.brush_map_mode, &painter->mask_mapping); + pos, brush->mask_mtex.brush_map_mode, &painter->mask_mapping); } if (do_view || do_random) diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 4eae82c5ea8..beab5011f2e 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -2830,7 +2830,7 @@ void RNA_property_collection_skip(CollectionPropertyIterator *iter, int num) ArrayIterator *internal = iter->internal; if (!internal->skip) { - internal->ptr += internal->itemsize*(num-1); + internal->ptr += internal->itemsize * (num - 1); iter->valid = (internal->ptr < internal->endptr); if (iter->valid) RNA_property_collection_next(iter); |