Revision: 47985
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47985
Author: campbellbarton
Date: 2012-06-16 09:18:00 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-06-16
09:16:24 UTC (rev 47984)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-06-16
09:18:00 UTC (rev 47985)
@@ -216,7 +216,7 @@
}
void BKE_tracking_get_projection_matrix(MovieTracking *tracking,
MovieTrackingObject *object,
- int framenr, int winx, int winy, float
mat[4][4])
+ int framenr, int winx, int winy, float
mat[4][4])
{
MovieReconstructedCamera *camera;
float lens = tracking->camera.focal * tracking->camera.sensor_width /
(float)winx;
@@ -1416,13 +1416,13 @@
distortion->intrinsics =
libmv_CameraIntrinsicsNew(camera->focal,
camera->principal[0], camera->principal[1] * aspy,
camera->k1,
camera->k2, camera->k3,
- calibration_width,
calibration_height * aspy);
+
calibration_width, calibration_height * aspy);
}
else {
libmv_CameraIntrinsicsUpdate(distortion->intrinsics,
camera->focal,
camera->principal[0],
camera->principal[1] * aspy,
camera->k1, camera->k2, camera->k3,
- calibration_width, calibration_height *
aspy);
+ calibration_width,
calibration_height * aspy);
}
#else
(void) distortion;
@@ -1559,7 +1559,7 @@
camera->intrinsics = BKE_tracking_distortion_new();
return BKE_tracking_distortion_exec(camera->intrinsics, tracking, ibuf,
calibration_width,
- calibration_height, overscan, TRUE);
+ calibration_height, overscan, TRUE);
}
ImBuf *BKE_tracking_distort_frame(MovieTracking *tracking, ImBuf *ibuf, int
calibration_width,
@@ -1571,7 +1571,7 @@
camera->intrinsics = BKE_tracking_distortion_new();
return BKE_tracking_distortion_exec(camera->intrinsics, tracking, ibuf,
calibration_width,
- calibration_height, overscan, FALSE);
+ calibration_height, overscan,
FALSE);
}
/*********************** Image sampling *************************/
@@ -1579,14 +1579,14 @@
static void disable_imbuf_channels(ImBuf *ibuf, MovieTrackingTrack *track, int
grayscale)
{
BKE_tracking_disable_channels(ibuf, track->flag & TRACK_DISABLE_RED,
- track->flag & TRACK_DISABLE_GREEN,
- track->flag & TRACK_DISABLE_BLUE,
grayscale);
+ track->flag & TRACK_DISABLE_GREEN,
+ track->flag & TRACK_DISABLE_BLUE,
grayscale);
}
ImBuf *BKE_tracking_sample_pattern(int frame_width, int frame_height, ImBuf
*search_ibuf,
- MovieTrackingTrack *track,
MovieTrackingMarker *marker,
- int use_mask, int num_samples_x, int
num_samples_y,
- float pos[2])
+ MovieTrackingTrack *track,
MovieTrackingMarker *marker,
+ int use_mask, int num_samples_x, int
num_samples_y,
+ float pos[2])
{
#ifdef WITH_LIBMV
ImBuf *pattern_ibuf;
@@ -1662,7 +1662,7 @@
search_ibuf = BKE_tracking_get_search_imbuf(ibuf, track, marker,
anchored, disable_channels);
pattern_ibuf = BKE_tracking_sample_pattern(ibuf->x, ibuf->y,
search_ibuf, track, marker,
- FALSE, num_samples_x,
num_samples_y, NULL);
+ FALSE, num_samples_x,
num_samples_y, NULL);
IMB_freeImBuf(search_ibuf);
@@ -1712,7 +1712,7 @@
* out, do a partial grayscale conversion so the display is better.
*/
void BKE_tracking_disable_channels(ImBuf *ibuf, int disable_red, int
disable_green, int disable_blue,
- int grayscale)
+ int grayscale)
{
int x, y;
float scale;
@@ -2471,9 +2471,9 @@
/* run the tracker! */
tracked = libmv_trackRegion(&options,
track_context->search_area,
-
track_context->search_area_width,
-
track_context->search_area_height,
-
patch_new, width, height,
+
track_context->search_area_width,
+
track_context->search_area_height,
+ patch_new, width,
height,
src_pixel_x,
src_pixel_y,
&result,
dst_pixel_x,
dst_pixel_y);
@@ -2483,7 +2483,7 @@
#pragma omp critical
{
tracking_insert_new_marker(context, track,
marker, curfra, tracked,
- frame_width,
frame_height, dst_pixel_x, dst_pixel_y);
+ frame_width,
frame_height, dst_pixel_x, dst_pixel_y);
}
ok = TRUE;
@@ -3059,7 +3059,7 @@
MEM_freeN(pixels);
detect_retrieve_libmv_features(tracking, tracksbase, features, framenr,
- ibuf->x, ibuf->y, layer, place_outside_layer);
+ ibuf->x, ibuf->y, layer,
place_outside_layer);
libmv_destroyFeatures(features);
#else
Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-16
09:16:24 UTC (rev 47984)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c 2012-06-16
09:18:00 UTC (rev 47985)
@@ -838,15 +838,15 @@
glLineStipple(3, 0xaaaa);
glBegin(GL_LINE_LOOP);
- glVertex2f(pat_min[0] - dx, pat_min[1] - dy);
- glVertex2f(pat_max[0] + dx, pat_min[1] - dy);
- glVertex2f(pat_max[0] + dx, pat_max[1] + dy);
- glVertex2f(pat_min[0] - dx, pat_max[1] + dy);
+ glVertex2f(pat_min[0] - dx, pat_min[1] - dy);
+ glVertex2f(pat_max[0] + dx, pat_min[1] - dy);
+ glVertex2f(pat_max[0] + dx, pat_max[1] + dy);
+ glVertex2f(pat_min[0] - dx, pat_max[1] + dy);
glEnd();
glBegin(GL_LINES);
- glVertex2f(0.0f, 0.0f);
- glVertex2fv(tilt_ctrl);
+ glVertex2f(0.0f, 0.0f);
+ glVertex2fv(tilt_ctrl);
glEnd();
glDisable(GL_LINE_STIPPLE);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2012-06-16 09:16:24 UTC (rev 47984)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
2012-06-16 09:18:00 UTC (rev 47985)
@@ -153,12 +153,14 @@
BoundBox *bb = rv3d->clipbb;
if (bb) {
- static unsigned int clipping_index[6][4] = {{0, 1, 2, 3},
- {0, 4, 5, 1},
- {4, 7, 6, 5},
- {7, 3, 2, 6},
- {1, 5, 6, 2},
- {7, 4, 0, 3}};
+ static unsigned int clipping_index[6][4] = {
+ {0, 1, 2, 3},
+ {0, 4, 5, 1},
+ {4, 7, 6, 5},
+ {7, 3, 2, 6},
+ {1, 5, 6, 2},
+ {7, 4, 0, 3}
+ };
/* fill in zero alpha for rendering & re-projection [#31530] */
unsigned char col[4];
@@ -2835,7 +2837,7 @@
cliprct.xmax = CLAMPIS(cliprct.xmax, ar->winrct.xmin,
ar->winrct.xmax);
cliprct.ymax = CLAMPIS(cliprct.ymax, ar->winrct.ymin,
ar->winrct.ymax);
- if(cliprct.xmax > cliprct.xmin && cliprct.ymax > cliprct.ymin) {
+ if (cliprct.xmax > cliprct.xmin && cliprct.ymax > cliprct.ymin)
{
glGetIntegerv(GL_SCISSOR_BOX, scissor);
glScissor(cliprct.xmin, cliprct.ymin, cliprct.xmax -
cliprct.xmin, cliprct.ymax - cliprct.ymin);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
2012-06-16 09:16:24 UTC (rev 47984)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
2012-06-16 09:18:00 UTC (rev 47985)
@@ -92,9 +92,9 @@
int selected,
int include_children,
int include_armatures,
- int deform_bones_only,
+ int deform_bones_only,
int use_object_instantiation,
- int sort_by_name,
+ int sort_by_name,
int second_life)
{
collada_export(scene, filepath, apply_modifiers, selected,
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2012-06-16 09:16:24 UTC (rev
47984)
+++ trunk/blender/source/creator/creator.c 2012-06-16 09:18:00 UTC (rev
47985)
@@ -153,8 +153,8 @@
/* for the callbacks: */
#define BLEND_VERSION_STRING_FMT \
- "Blender %d.%02d (sub %d)\n",
\
- BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION
\
+ "Blender %d.%02d (sub %d)\n", \
+ BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION \
/* Initialize callbacks for the modules that need them */
static void setCallbacks(void);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
