Revision: 36276
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36276
Author: campbellbarton
Date: 2011-04-21 15:53:30 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
converted more mixed tab/space indentations to tabs. only whitespace changes.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/intern/guardedalloc/test/simpletest/memtest.c
trunk/blender/release/plugins/sequence/blur.c
trunk/blender/release/plugins/sequence/gamma.c
trunk/blender/source/blender/avi/intern/options.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/blenkernel/intern/exotic.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/writeavi.c
trunk/blender/source/blender/blenlib/intern/BLI_ghash.c
trunk/blender/source/blender/blenlib/intern/boxpack2d.c
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/math_vector_inline.c
trunk/blender/source/blender/blenlib/intern/noise.c
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/armature/reeb.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_text/text_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_header.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/uvedit/uvedit_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/thumbs.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesdna/intern/dna_genfile.c
trunk/blender/source/blender/makesrna/intern/rna_brush.c
trunk/blender/source/blender/makesrna/intern/rna_controller.c
trunk/blender/source/blender/makesrna/intern/rna_image_api.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_object_api.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_build.c
trunk/blender/source/blender/modifiers/intern/MOD_edgesplit.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
trunk/blender/source/blender/nodes/intern/CMP_util.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
trunk/blender/source/blender/python/generic/IDProp.c
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/python/generic/mathutils_geometry.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/pixelblending.c
trunk/blender/source/blender/render/intern/source/pixelshading.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/rendercore.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
trunk/blender/source/gameengine/GamePlayer/xembed/npunix.c
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2011-04-21 14:27:16 UTC
(rev 36275)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2011-04-21 15:53:30 UTC
(rev 36276)
@@ -369,16 +369,16 @@
{
#include <fcntl.h>
- int fd;
- fd = open("/dev/zero", O_RDWR);
+ int fd;
+ fd = open("/dev/zero", O_RDWR);
- memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
- close(fd);
+ memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
+ PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ close(fd);
}
#else
memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
+ PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
#endif
if(memh!=(MemHead *)-1) {
@@ -792,7 +792,7 @@
forwok->nextname = backok->name;
} else{
forwok->next = NULL;
- membase->last = (struct localLink *)
&forwok->next;
+ membase->last = (struct localLink *)
&forwok->next;
/* membase->last = (struct Link *) &forwok->next;
*/
}
} else{
Modified: trunk/blender/intern/guardedalloc/test/simpletest/memtest.c
===================================================================
--- trunk/blender/intern/guardedalloc/test/simpletest/memtest.c 2011-04-21
14:27:16 UTC (rev 36275)
+++ trunk/blender/intern/guardedalloc/test/simpletest/memtest.c 2011-04-21
15:53:30 UTC (rev 36276)
@@ -60,7 +60,7 @@
int i = 0;
/* ----------------------------------------------------------------- */
- switch (argc) {
+ switch (argc) {
case 2:
verbose = atoi(argv[1]);
if (verbose < 0) verbose = 0;
Modified: trunk/blender/release/plugins/sequence/blur.c
===================================================================
--- trunk/blender/release/plugins/sequence/blur.c 2011-04-21 14:27:16 UTC
(rev 36275)
+++ trunk/blender/release/plugins/sequence/blur.c 2011-04-21 15:53:30 UTC
(rev 36276)
@@ -41,7 +41,7 @@
VarStruct varstr[]= {
LABEL, "Input: 1 strip", 0.0, 0.0, 0.0, "",
- NUMSLI|FLO, "Blur", 0.5, 0.0, 10.0, "Maximum
filtersize",
+ NUMSLI|FLO, "Blur", 0.5, 0.0, 10.0, "Maximum
filtersize",
NUMSLI|FLO, "Gamma", 1.0, 0.4, 2.0, "Gamma
correction",
TOG|INT, "Animated", 0.0, 0.0, 1.0, "For (Ipo)
animated blur",
NUM|INT, "debug", 0.0, 0.0, 2.0,
Modified: trunk/blender/release/plugins/sequence/gamma.c
===================================================================
--- trunk/blender/release/plugins/sequence/gamma.c 2011-04-21 14:27:16 UTC
(rev 36275)
+++ trunk/blender/release/plugins/sequence/gamma.c 2011-04-21 15:53:30 UTC
(rev 36276)
@@ -85,7 +85,7 @@
int y;
for (y = 0; y < 256; y++) {
- float v = 1.0 * y / 255;
+ float v = 1.0 * y / 255;
v += setup;
v *= gain;
v = pow(v, gamma);
Modified: trunk/blender/source/blender/avi/intern/options.c
===================================================================
--- trunk/blender/source/blender/avi/intern/options.c 2011-04-21 14:27:16 UTC
(rev 36275)
+++ trunk/blender/source/blender/avi/intern/options.c 2011-04-21 15:53:30 UTC
(rev 36276)
@@ -53,77 +53,77 @@
switch (option_type) {
case AVI_OPTION_TYPE_MAIN:
switch (option) {
- case AVI_OPTION_WIDTH:
- movie->header->Width = *((int *) opt_data);
- movie->header->SuggestedBufferSize =
movie->header->Width*movie->header->Height*3;
+ case AVI_OPTION_WIDTH:
+ movie->header->Width = *((int *) opt_data);
+ movie->header->SuggestedBufferSize =
movie->header->Width*movie->header->Height*3;
- for (i=0; i < movie->header->Streams; i++) {
- if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- ((AviBitmapInfoHeader *)
movie->streams[i].sf)->Width = *((int *) opt_data);
-
movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
- movie->streams[i].sh.right =
*((int *) opt_data);
- ((AviBitmapInfoHeader *)
movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
- fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie,
movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ for (i=0; i < movie->header->Streams; i++) {
+ if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ ((AviBitmapInfoHeader *)
movie->streams[i].sf)->Width = *((int *) opt_data);
+
movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
+ movie->streams[i].sh.right = *((int *)
opt_data);
+ ((AviBitmapInfoHeader *)
movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
+ fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1,
movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
+ }
- break;
-
- case AVI_OPTION_HEIGHT:
- movie->header->Height = *((int *) opt_data);
- movie->header->SuggestedBufferSize =
movie->header->Width*movie->header->Height*3;
-
- for (i=0; i < movie->header->Streams; i++) {
- if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- ((AviBitmapInfoHeader *)
movie->streams[i].sf)->Height = *((int *) opt_data);
-
movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
- movie->streams[i].sh.bottom =
*((int *) opt_data);
- ((AviBitmapInfoHeader *)
movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
- fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie,
movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ break;
+
+ case AVI_OPTION_HEIGHT:
+ movie->header->Height = *((int *) opt_data);
+ movie->header->SuggestedBufferSize =
movie->header->Width*movie->header->Height*3;
+
+ for (i=0; i < movie->header->Streams; i++) {
+ if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ ((AviBitmapInfoHeader *)
movie->streams[i].sf)->Height = *((int *) opt_data);
+
movie->streams[i].sh.SuggestedBufferSize = movie->header->SuggestedBufferSize;
+ movie->streams[i].sh.bottom = *((int *)
opt_data);
+ ((AviBitmapInfoHeader *)
movie->streams[i].sf)->SizeImage = movie->header->SuggestedBufferSize;
+ fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1,
movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
+ }
- break;
-
- case AVI_OPTION_QUALITY:
- for (i=0; i < movie->header->Streams; i++) {
- if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- movie->streams[i].sh.Quality =
(*((int *) opt_data))*100;
- fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie,
movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ break;
+
+ case AVI_OPTION_QUALITY:
+ for (i=0; i < movie->header->Streams; i++) {
+ if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ movie->streams[i].sh.Quality = (*((int
*) opt_data))*100;
+ fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1,
movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
- break;
-
- case AVI_OPTION_FRAMERATE:
- if (1000000/(*((double *) opt_data)))
- movie->header->MicroSecPerFrame =
1000000/(*((double *) opt_data));
+ }
+ break;
- for (i=0; i < movie->header->Streams; i++) {
- if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
- movie->streams[i].sh.Scale =
movie->header->MicroSecPerFrame;
- fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
- awrite (movie,
movie->streams[i].sf, 1, movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
- }
+ case AVI_OPTION_FRAMERATE:
+ if (1000000/(*((double *) opt_data)))
+ movie->header->MicroSecPerFrame =
1000000/(*((double *) opt_data));
+
+ for (i=0; i < movie->header->Streams; i++) {
+ if
(avi_get_format_type(movie->streams[i].format) == FCC("vids")) {
+ movie->streams[i].sh.Scale =
movie->header->MicroSecPerFrame;
+ fseek (movie->fp,
movie->offset_table[1+i*2+1], SEEK_SET);
+ awrite (movie, movie->streams[i].sf, 1,
movie->streams[i].sf_size, movie->fp, AVI_BITMAPH);
}
-
+ }
+
}
- fseek (movie->fp, movie->offset_table[0], SEEK_SET);
- awrite (movie, movie->header, 1, sizeof(AviMainHeader), movie->fp,
AVI_MAINH);
+ fseek (movie->fp, movie->offset_table[0], SEEK_SET);
+ awrite (movie, movie->header, 1, sizeof(AviMainHeader),
movie->fp, AVI_MAINH);
- break;
- case AVI_OPTION_TYPE_STRH:
- break;
- case AVI_OPTION_TYPE_STRF:
- break;
- default:
- return AVI_ERROR_OPTION;
- break;
- }
+ break;
+ case AVI_OPTION_TYPE_STRH:
+ break;
+ case AVI_OPTION_TYPE_STRF:
+ break;
+ default:
+ return AVI_ERROR_OPTION;
+ break;
+ }
- return AVI_ERROR_NONE;
+ return AVI_ERROR_NONE;
}
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2011-04-21
14:27:16 UTC (rev 36275)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2011-04-21
15:53:30 UTC (rev 36276)
@@ -856,10 +856,10 @@
#if 0
static float projectPointOntoLine(float *p, float *a, float *b)
{
- float ba[3], pa[3];
- VECSUB(ba, b, a);
- VECSUB(pa, p, a);
- return INPR(pa, ba) / INPR(ba, ba);
+ float ba[3], pa[3];
+ VECSUB(ba, b, a);
+ VECSUB(pa, p, a);
+ return INPR(pa, ba) / INPR(ba, ba);
}
static void calculateEENormal(float *np1, float *np2, float *np3, float
*np4,float *out_normal)
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2011-04-21
14:27:16 UTC (rev 36275)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2011-04-21
15:53:30 UTC (rev 36276)
@@ -1026,19 +1026,19 @@
rt2= 3.0f*(q0-2.0f*q1+q2)/f;
f*= it;
rt3= (q3-q0+3.0f*(q1-q2))/f;
-
- q0= rt0;
+
+ q0= rt0;
q1= rt1+rt2+rt3;
q2= 2*rt2+6*rt3;
q3= 6*rt3;
-
- for(a=0; a<=it; a++) {
+
+ for(a=0; a<=it; a++) {
*p= q0;
p = (float *)(((char *)p)+stride);
q0+= q1;
- q1+= q2;
- q2+= q3;
- }
+ q1+= q2;
+ q2+= q3;
+ }
}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
