Revision: 47701
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47701
Author: campbellbarton
Date: 2012-06-10 19:59:02 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/itasc/kdl/frames.inl
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/BKE_tracking.h
trunk/blender/source/blender/blenkernel/intern/tracking.c
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_clip/clip_buttons.c
trunk/blender/source/blender/editors/space_clip/clip_dopesheet_draw.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_graph_draw.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_intern.h
trunk/blender/source/blender/editors/space_clip/clip_utils.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/editors/space_clip/tracking_ops.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/makesdna/DNA_movieclip_types.h
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesdna/DNA_tracking_types.h
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
Modified: trunk/blender/intern/itasc/kdl/frames.inl
===================================================================
--- trunk/blender/intern/itasc/kdl/frames.inl 2012-06-10 19:32:57 UTC (rev
47700)
+++ trunk/blender/intern/itasc/kdl/frames.inl 2012-06-10 19:59:02 UTC (rev
47701)
@@ -20,8 +20,8 @@
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this library; if not, write to the Free Software *
- * Foundation, Inc., 51 Franklin Street, *
- * Fifth Floor, Boston, MA 02110-1301, USA. *
+ * Foundation, Inc., 51 Franklin Street, *
+ * Fifth Floor, Boston, MA 02110-1301, USA. *
* *
***************************************************************************/
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-06-10
19:32:57 UTC (rev 47700)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2012-06-10
19:59:02 UTC (rev 47701)
@@ -49,7 +49,7 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR a
+#define BLENDER_VERSION_CHAR a
/* alpha/beta/rc/release, docs use this */
#define BLENDER_VERSION_CYCLE alpha
Modified: trunk/blender/source/blender/blenkernel/BKE_tracking.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_tracking.h 2012-06-10
19:32:57 UTC (rev 47700)
+++ trunk/blender/source/blender/blenkernel/BKE_tracking.h 2012-06-10
19:59:02 UTC (rev 47701)
@@ -113,7 +113,7 @@
/* 2D tracking */
struct MovieTrackingContext *BKE_tracking_context_new(struct MovieClip *clip,
struct MovieClipUser *user,
- short backwards, short sequence);
+ short backwards, short
sequence);
void BKE_tracking_context_free(struct MovieTrackingContext *context);
void BKE_tracking_sync(struct MovieTrackingContext *context);
void BKE_tracking_sync_user(struct MovieClipUser *user, struct
MovieTrackingContext *context);
@@ -123,15 +123,15 @@
int BKE_tracking_can_reconstruct(struct MovieTracking *tracking, struct
MovieTrackingObject *object,
char *error_msg, int error_size);
-struct MovieReconstructContext* BKE_tracking_reconstruction_context_new(struct
MovieTracking *tracking,
- struct MovieTrackingObject *object, int keyframe1, int
keyframe2, int width, int height);
+struct MovieReconstructContext *BKE_tracking_reconstruction_context_new(struct
MovieTracking *tracking,
+ struct
MovieTrackingObject *object, int keyframe1, int keyframe2, int width, int
height);
void BKE_tracking_reconstruction_context_free(struct MovieReconstructContext
*context);
void BKE_tracking_solve_reconstruction(struct MovieReconstructContext
*context, short *stop, short *do_update,
float *progress, char *stats_message,
int message_size);
int BKE_tracking_finish_reconstruction(struct MovieReconstructContext
*context, struct MovieTracking *tracking);
struct MovieReconstructedCamera *BKE_tracking_get_reconstructed_camera(struct
MovieTracking *tracking,
- struct MovieTrackingObject *object, int framenr);
+ struct
MovieTrackingObject *object, int framenr);
void BKE_tracking_get_interpolated_camera(struct MovieTracking *tracking,
struct MovieTrackingObject *object,
int framenr, float mat[4][4]);
@@ -172,39 +172,39 @@
void BKE_tracking_dopesheet_tag_update(struct MovieTracking *tracking);
void BKE_tracking_dopesheet_update(struct MovieTracking *tracking, int
sort_method, int inverse);
-#define TRACK_SELECTED(track) ((track)->flag&SELECT
|| (track)->pat_flag&SELECT || (track)->search_flag&SELECT)
+#define TRACK_SELECTED(track) ((track)->flag & SELECT ||
(track)->pat_flag & SELECT || (track)->search_flag & SELECT)
-#define TRACK_AREA_SELECTED(track, area) ((area)==TRACK_AREA_POINT ?
(track)->flag&SELECT : \
-
((area)==TRACK_AREA_PAT ? (track)->pat_flag&SELECT : \
-
(track)->search_flag&SELECT))
+#define TRACK_AREA_SELECTED(track, area) ((area) == TRACK_AREA_POINT ?
(track)->flag & SELECT : \
+ ((area) == TRACK_AREA_PAT ?
(track)->pat_flag & SELECT : \
+ (track)->search_flag & SELECT))
-#define TRACK_VIEW_SELECTED(sc, track) ((((track)->flag &
TRACK_HIDDEN)==0) && \
- ( TRACK_AREA_SELECTED(track,
TRACK_AREA_POINT) || \
- (((sc)->flag &
SC_SHOW_MARKER_PATTERN) && TRACK_AREA_SELECTED(track, TRACK_AREA_PAT)) || \
- (((sc)->flag &
SC_SHOW_MARKER_SEARCH) && TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))))
+#define TRACK_VIEW_SELECTED(sc, track) ((((track)->flag & TRACK_HIDDEN)
== 0) && \
+ (TRACK_AREA_SELECTED(track,
TRACK_AREA_POINT) || \
+ (((sc)->flag &
SC_SHOW_MARKER_PATTERN) && TRACK_AREA_SELECTED(track, TRACK_AREA_PAT)) || \
+ (((sc)->flag &
SC_SHOW_MARKER_SEARCH) && TRACK_AREA_SELECTED(track, TRACK_AREA_SEARCH))))
-#define MARKER_VISIBLE(sc, track, marker) (((marker)->flag &
MARKER_DISABLED)==0 || ((sc)->flag & SC_HIDE_DISABLED)==0 ||
(sc->clip->tracking.act_track == track))
+#define MARKER_VISIBLE(sc, track, marker) (((marker)->flag &
MARKER_DISABLED) == 0 || ((sc)->flag & SC_HIDE_DISABLED) == 0 ||
(sc->clip->tracking.act_track == track))
-#define TRACK_CLEAR_UPTO 0
-#define TRACK_CLEAR_REMAINED 1
-#define TRACK_CLEAR_ALL 2
+#define TRACK_CLEAR_UPTO 0
+#define TRACK_CLEAR_REMAINED 1
+#define TRACK_CLEAR_ALL 2
-#define CLAMP_PAT_DIM 1
-#define CLAMP_PAT_POS 2
-#define CLAMP_SEARCH_DIM 3
-#define CLAMP_SEARCH_POS 4
+#define CLAMP_PAT_DIM 1
+#define CLAMP_PAT_POS 2
+#define CLAMP_SEARCH_DIM 3
+#define CLAMP_SEARCH_POS 4
-#define TRACK_AREA_NONE -1
-#define TRACK_AREA_POINT 1
-#define TRACK_AREA_PAT 2
-#define TRACK_AREA_SEARCH 4
+#define TRACK_AREA_NONE -1
+#define TRACK_AREA_POINT 1
+#define TRACK_AREA_PAT 2
+#define TRACK_AREA_SEARCH 4
-#define TRACK_AREA_ALL
(TRACK_AREA_POINT|TRACK_AREA_PAT|TRACK_AREA_SEARCH)
+#define TRACK_AREA_ALL (TRACK_AREA_POINT | TRACK_AREA_PAT |
TRACK_AREA_SEARCH)
-#define TRACK_SORT_NONE -1
-#define TRACK_SORT_NAME 0
-#define TRACK_SORT_LONGEST 1
-#define TRACK_SORT_TOTAL 2
-#define TRACK_SORT_AVERAGE_ERROR 3
+#define TRACK_SORT_NONE -1
+#define TRACK_SORT_NAME 0
+#define TRACK_SORT_LONGEST 1
+#define TRACK_SORT_TOTAL 2
+#define TRACK_SORT_AVERAGE_ERROR 3
#endif
Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-06-10
19:32:57 UTC (rev 47700)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2012-06-10
19:59:02 UTC (rev 47701)
@@ -39,7 +39,7 @@
#include "DNA_gpencil_types.h"
#include "DNA_camera_types.h"
#include "DNA_movieclip_types.h"
-#include "DNA_object_types.h" /* SELECT */
+#include "DNA_object_types.h" /* SELECT */
#include "DNA_scene_types.h"
#include "BLI_utildefines.h"
@@ -401,7 +401,7 @@
track->markersnr++;
if (track->markers)
- track->markers = MEM_reallocN(track->markers,
sizeof(MovieTrackingMarker)*track->markersnr);
+ track->markers = MEM_reallocN(track->markers,
sizeof(MovieTrackingMarker) * track->markersnr);
else
track->markers =
MEM_callocN(sizeof(MovieTrackingMarker), "MovieTracking markers");
@@ -567,7 +567,7 @@
while (a < track->markersnr) {
if (track->markers[a].framenr > ref_frame) {
track->markersnr = a;
- track->markers = MEM_reallocN(track->markers,
sizeof(MovieTrackingMarker)*track->markersnr);
+ track->markers = MEM_reallocN(track->markers,
sizeof(MovieTrackingMarker) * track->markersnr);
break;
}
@@ -586,7 +586,7 @@
memmove(track->markers, track->markers + a,
(track->markersnr - a) * sizeof(MovieTrackingMarker));
track->markersnr = track->markersnr - a;
- track->markers = MEM_reallocN(track->markers,
sizeof(MovieTrackingMarker)*track->markersnr);
+ track->markers = MEM_reallocN(track->markers,
sizeof(MovieTrackingMarker) * track->markersnr);
break;
}
@@ -707,8 +707,8 @@
MEM_freeN(dst_track->markers);
- dst_track->markers = MEM_callocN(i*sizeof(MovieTrackingMarker),
"tracking joined tracks");
- memcpy(dst_track->markers, markers, i*sizeof(MovieTrackingMarker));
+ dst_track->markers = MEM_callocN(i * sizeof(MovieTrackingMarker),
"tracking joined tracks");
+ memcpy(dst_track->markers, markers, i * sizeof(MovieTrackingMarker));
dst_track->markersnr = i;
@@ -877,10 +877,10 @@
map->num_tracks = num_tracks;
map->customdata_size = customdata_size;
- map->tracks = MEM_callocN(sizeof(MovieTrackingTrack)*num_tracks,
"TrackingsMap tracks");
+ map->tracks = MEM_callocN(sizeof(MovieTrackingTrack) * num_tracks,
"TrackingsMap tracks");
if (customdata_size)
- map->customdata = MEM_callocN(customdata_size*num_tracks,
"TracksMap customdata");
+ map->customdata = MEM_callocN(customdata_size * num_tracks,
"TracksMap customdata");
map->hash = BLI_ghash_ptr_new("TracksMap hash");
@@ -897,7 +897,7 @@
*track = &map->tracks[index];
if (map->customdata)
- *customdata = &map->customdata[index*map->customdata_size];
+ *customdata = &map->customdata[index * map->customdata_size];
}
static void tracks_map_insert(TracksMap *map, MovieTrackingTrack *track, void
*customdata)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
