[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39833] trunk/blender/source/blender: spaces -> tabs (configure you're editors right!)
Campbell Barton
ideasman42 at gmail.com
Thu Sep 1 03:48:55 CEST 2011
Revision: 39833
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39833
Author: campbellbarton
Date: 2011-09-01 01:48:50 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
spaces -> tabs (configure you're editors right!)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/editors/object/object_bake.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/indexer_dv.c
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/zbuf.c
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -1487,8 +1487,8 @@
sdis = clmd->coll_parms->distance_repel + epsilon2 + FLT_EPSILON;
- /*apply a repulsion force, to help the solver along.
- this is kindof crude, it only tests one vert of the triangle*/
+ /* apply a repulsion force, to help the solver along.
+ * this is kindof crude, it only tests one vert of the triangle */
if (isect_ray_plane_v3(cloth->verts[collpair->ap1].tx, n2, collmd->current_xnew[collpair->bp1].co,
collmd->current_xnew[collpair->bp2].co,
collmd->current_xnew[collpair->bp3].co, &l, 0))
Modified: trunk/blender/source/blender/blenlib/intern/math_geom.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/blenlib/intern/math_geom.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -1968,7 +1968,7 @@
void resolve_quad_uv(float uv[2], const float st[2], const float st0[2], const float st1[2], const float st2[2], const float st3[2])
{
const double signed_area= (st0[0]*st1[1] - st0[1]*st1[0]) + (st1[0]*st2[1] - st1[1]*st2[0]) +
- (st2[0]*st3[1] - st2[1]*st3[0]) + (st3[0]*st0[1] - st3[1]*st0[0]);
+ (st2[0]*st3[1] - st2[1]*st3[0]) + (st3[0]*st0[1] - st3[1]*st0[0]);
/* X is 2D cross product (determinant)
A= (p0-p) X (p0-p3)*/
Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/editors/object/object_bake.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -159,7 +159,7 @@
static void multiresbake_get_normal(const MResolvePixelData *data, float norm[], const int face_num, const int vert_index)
{
unsigned int indices[]= {data->mface[face_num].v1, data->mface[face_num].v2,
- data->mface[face_num].v3, data->mface[face_num].v4};
+ data->mface[face_num].v3, data->mface[face_num].v4};
const int smoothnormal= (data->mface[face_num].flag & ME_SMOOTH);
if(!smoothnormal) { /* flat */
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -1385,7 +1385,7 @@
default:
ntype->uifunc= NULL;
}
- if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
+ if (ntype->uifuncbut == NULL) ntype->uifuncbut = ntype->uifunc;
}
/* ******* init draw callbacks for all tree types, only called in usiblender.c, once ************* */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -625,8 +625,8 @@
}
}
else {
- const float dx= (2.0f * mval[0] / (float)ar->winx) - 1.0f;
- const float dy= (2.0f * mval[1] / (float)ar->winy) - 1.0f;
+ const float dx= (2.0f * mval[0] / (float)ar->winx) - 1.0f;
+ const float dy= (2.0f * mval[1] / (float)ar->winy) - 1.0f;
line_sta[0]= (rv3d->persinv[0][0] * dx) + (rv3d->persinv[1][0] * dy) + rv3d->viewinv[3][0];
line_sta[1]= (rv3d->persinv[0][1] * dx) + (rv3d->persinv[1][1] * dy) + rv3d->viewinv[3][1];
line_sta[2]= (rv3d->persinv[0][2] * dx) + (rv3d->persinv[1][2] * dy) + rv3d->viewinv[3][2];
Modified: trunk/blender/source/blender/imbuf/intern/anim_movie.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/anim_movie.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/imbuf/intern/anim_movie.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -922,7 +922,7 @@
static void ffmpeg_decode_video_frame_scan(
struct anim * anim, int64_t pts_to_search)
{
- /* there seem to exist *very* silly GOP lengths out in the wild... */
+ /* there seem to exist *very* silly GOP lengths out in the wild... */
int count = 1000;
av_log(anim->pFormatCtx,
Modified: trunk/blender/source/blender/imbuf/intern/indexer_dv.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/indexer_dv.c 2011-09-01 01:28:45 UTC (rev 39832)
+++ trunk/blender/source/blender/imbuf/intern/indexer_dv.c 2011-09-01 01:48:50 UTC (rev 39833)
@@ -30,8 +30,8 @@
#include <time.h>
typedef struct indexer_dv_bitstream {
- unsigned char* buffer;
- int bit_pos;
+ unsigned char* buffer;
+ int bit_pos;
} indexer_dv_bitstream;
static indexer_dv_bitstream bitstream_new(unsigned char* buffer_)
@@ -57,41 +57,41 @@
}
static int parse_num(indexer_dv_bitstream * b, int numbits) {
- return bitstream_get_bits(b, numbits);
+ return bitstream_get_bits(b, numbits);
}
static int parse_bcd(indexer_dv_bitstream * b, int n)
{
- char s[256];
+ char s[256];
char * p = s + (n+3)/4;
*p-- = 0;
- while (n > 4) {
- char a;
- int v = bitstream_get_bits(b, 4);
+ while (n > 4) {
+ char a;
+ int v = bitstream_get_bits(b, 4);
- n -= 4;
+ n -= 4;
a = '0' + v;
- if (a > '9') {
- bitstream_get_bits(b, n);
+ if (a > '9') {
+ bitstream_get_bits(b, n);
return -1;
- }
+ }
*p-- = a;
- }
- if (n) {
- char a;
- int v = bitstream_get_bits(b, n);
- a = '0' + v;
- if (a > '9') {
+ }
+ if (n) {
+ char a;
+ int v = bitstream_get_bits(b, n);
+ a = '0' + v;
+ if (a > '9') {
return -1;
- }
- *p-- = a;
- }
+ }
+ *p-- = a;
+ }
- return atol(s);
+ return atol(s);
}
typedef struct indexer_dv_context
@@ -125,124 +125,124 @@
static void parse_packet(indexer_dv_context * This, unsigned char * p)
{
- indexer_dv_bitstream b;
- int type = p[0];
+ indexer_dv_bitstream b;
+ int type = p[0];
b = bitstream_new(p + 1);
- switch (type) {
- case 0x62: // Record date
- parse_num(&b, 8);
- This->rec_curr_day = parse_bcd(&b, 6);
- parse_num(&b, 2);
- This->rec_curr_month = parse_bcd(&b, 5);
- parse_num(&b, 3);
- This->rec_curr_year = parse_bcd(&b, 8);
- if (This->rec_curr_year < 25) {
- This->rec_curr_year += 2000;
- } else {
- This->rec_curr_year += 1900;
- }
- This->got_record_date = 1;
- break;
- case 0x63: // Record time
- This->rec_curr_frame = parse_bcd(&b, 6);
- parse_num(&b, 2);
- This->rec_curr_second = parse_bcd(&b, 7);
- parse_num(&b, 1);
- This->rec_curr_minute = parse_bcd(&b, 7);
- parse_num(&b, 1);
- This->rec_curr_hour = parse_bcd(&b, 6);
- This->got_record_time = 1;
- break;
- }
+ switch (type) {
+ case 0x62: // Record date
+ parse_num(&b, 8);
+ This->rec_curr_day = parse_bcd(&b, 6);
+ parse_num(&b, 2);
+ This->rec_curr_month = parse_bcd(&b, 5);
+ parse_num(&b, 3);
+ This->rec_curr_year = parse_bcd(&b, 8);
+ if (This->rec_curr_year < 25) {
+ This->rec_curr_year += 2000;
+ } else {
+ This->rec_curr_year += 1900;
+ }
+ This->got_record_date = 1;
+ break;
+ case 0x63: // Record time
+ This->rec_curr_frame = parse_bcd(&b, 6);
+ parse_num(&b, 2);
+ This->rec_curr_second = parse_bcd(&b, 7);
+ parse_num(&b, 1);
+ This->rec_curr_minute = parse_bcd(&b, 7);
+ parse_num(&b, 1);
+ This->rec_curr_hour = parse_bcd(&b, 6);
+ This->got_record_time = 1;
+ break;
+ }
}
static void parse_header_block(indexer_dv_context * This, unsigned char* target)
{
int i;
- for (i = 3; i < 80; i += 5) {
- if (target[i] != 0xff) {
- parse_packet(This, target + i);
- }
- }
+ for (i = 3; i < 80; i += 5) {
+ if (target[i] != 0xff) {
+ parse_packet(This, target + i);
+ }
+ }
}
static void parse_subcode_blocks(
- indexer_dv_context * This, unsigned char* target)
+ indexer_dv_context * This, unsigned char* target)
{
int i,j;
- for (j = 0; j < 2; j++) {
- for (i = 3; i < 80; i += 5) {
- if (target[i] != 0xff) {
- parse_packet(This, target + i);
- }
- }
- }
+ for (j = 0; j < 2; j++) {
+ for (i = 3; i < 80; i += 5) {
+ if (target[i] != 0xff) {
+ parse_packet(This, target + i);
+ }
+ }
+ }
}
static void parse_vaux_blocks(
- indexer_dv_context * This, unsigned char* target)
+ indexer_dv_context * This, unsigned char* target)
{
int i,j;
- for (j = 0; j < 3; j++) {
- for (i = 3; i < 80; i += 5) {
- if (target[i] != 0xff) {
- parse_packet(This, target + i);
- }
- }
- target += 80;
- }
+ for (j = 0; j < 3; j++) {
+ for (i = 3; i < 80; i += 5) {
+ if (target[i] != 0xff) {
+ parse_packet(This, target + i);
+ }
+ }
+ target += 80;
+ }
}
static void parse_audio_headers(
- indexer_dv_context * This, unsigned char* target)
+ indexer_dv_context * This, unsigned char* target)
{
int i;
- for(i = 0; i < 9; i++) {
- if (target[3] != 0xff) {
- parse_packet(This, target + 3);
- }
- target += 16 * 80;
- }
+ for(i = 0; i < 9; i++) {
+ if (target[3] != 0xff) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list