Revision: 36271
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36271
Author: campbellbarton
Date: 2011-04-21 13:11:51 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
whitespace only, no functional change mixed tabs/spaces --> tabs.
Modified Paths:
--------------
trunk/blender/intern/guardedalloc/intern/mallocn.c
trunk/blender/intern/guardedalloc/intern/mmap_win.c
trunk/blender/release/plugins/sequence/color-correction-hsv.c
trunk/blender/release/plugins/sequence/color-correction-yuv.c
trunk/blender/release/plugins/sequence/dnr.c
trunk/blender/release/plugins/sequence/scatter.c
trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/avi/intern/codecs.c
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/deform.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/exotic.c
trunk/blender/source/blender/blenkernel/intern/image_gen.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/report.c
trunk/blender/source/blender/blenkernel/intern/sca.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/blenlib/intern/math_color.c
trunk/blender/source/blender/blenlib/intern/math_geom.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenlib/intern/string.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/armature/meshlaplacian.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/object/object_group.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_console/space_console.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_file/filesel.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.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/anim_movie.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_object_force.c
trunk/blender/source/blender/makesrna/intern/rna_sensor.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/makesrna/intern/rna_wm.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
trunk/blender/source/blender/nodes/intern/TEX_util.c
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/python/intern/bpy.c
trunk/blender/source/blender/python/intern/bpy_driver.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/python/intern/bpy_traceback.c
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/pixelblending.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadeinput.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mallocn.c 2011-04-21 12:48:07 UTC
(rev 36270)
+++ trunk/blender/intern/guardedalloc/intern/mallocn.c 2011-04-21 13:11:51 UTC
(rev 36271)
@@ -373,7 +373,7 @@
fd = open("/dev/zero", O_RDWR);
memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
close(fd);
}
#else
@@ -698,26 +698,26 @@
static void rem_memblock(MemHead *memh)
{
- remlink(membase,&memh->next);
- if (memh->prev) {
- if (memh->next)
+ remlink(membase,&memh->next);
+ if (memh->prev) {
+ if (memh->next)
MEMNEXT(memh->prev)->nextname =
MEMNEXT(memh->next)->name;
- else
+ else
MEMNEXT(memh->prev)->nextname = NULL;
- }
+ }
- totblock--;
- mem_in_use -= memh->len;
-
- if(memh->mmap) {
- mmap_in_use -= memh->len;
- if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
- printf("Couldn't unmap memory %s\n", memh->name);
- }
+ totblock--;
+ mem_in_use -= memh->len;
+
+ if(memh->mmap) {
+ mmap_in_use -= memh->len;
+ if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
+ printf("Couldn't unmap memory %s\n", memh->name);
+ }
else {
if(malloc_debug_memset && memh->len)
memset(memh+1, 255, memh->len);
- free(memh);
+ free(memh);
}
}
Modified: trunk/blender/intern/guardedalloc/intern/mmap_win.c
===================================================================
--- trunk/blender/intern/guardedalloc/intern/mmap_win.c 2011-04-21 12:48:07 UTC
(rev 36270)
+++ trunk/blender/intern/guardedalloc/intern/mmap_win.c 2011-04-21 13:11:51 UTC
(rev 36271)
@@ -114,7 +114,7 @@
/*
if ( fd == -1 ) {
_set_errno( EBADF );
- return MAP_FAILED;
+ return MAP_FAILED;
}
*/
@@ -128,16 +128,16 @@
}
} else {
if ( !DuplicateHandle( GetCurrentProcess(), fhandle,
GetCurrentProcess(),
- &fhandle, 0, FALSE,
DUPLICATE_SAME_ACCESS ) ) {
+ &fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) {
return MAP_FAILED;
}
}
maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL);
if ( maphandle == 0 ) {
- errno = EBADF;
+ errno = EBADF;
return MAP_FAILED;
- }
+ }
ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0);
if ( ptr == NULL ) {
@@ -159,7 +159,7 @@
mm->mmap = ptr;
mmap_addtail(mmapbase, mm);
- return ptr;
+ return ptr;
}
/* munmap for windows */
@@ -168,14 +168,14 @@
MemMap *mm = mmap_findlink(mmapbase, ptr);
if (!mm) {
errno=EINVAL;
- return -1;
+ return -1;
}
UnmapViewOfFile( mm->mmap );
CloseHandle( mm->maphandle );
CloseHandle( mm->fhandle);
mmap_remlink(mmapbase, mm);
free(mm);
- return 0;
+ return 0;
}
/* --------------------------------------------------------------------- */
@@ -233,16 +233,16 @@
int prot = PAGE_NOACCESS;
if ( ( flags & PROT_READ ) == PROT_READ ) {
- if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
- prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE :
PAGE_READWRITE;
+ if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READWRITE :
PAGE_READWRITE;
} else {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ :
PAGE_READONLY;
}
- } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
prot = (flags & PROT_EXEC) ? PAGE_EXECUTE_READ : PAGE_WRITECOPY;
- } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
- prot = PAGE_EXECUTE_READ;
- }
+ } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
+ prot = PAGE_EXECUTE_READ;
+ }
return prot;
}
@@ -251,16 +251,16 @@
int access = 0;
if ( ( flags & PROT_READ ) == PROT_READ ) {
- if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
- access = FILE_MAP_WRITE;
+ if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ access = FILE_MAP_WRITE;
} else {
access = (flags & PROT_EXEC) ? FILE_MAP_EXECUTE :
FILE_MAP_READ;
}
- } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
+ } else if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
access = FILE_MAP_COPY;
- } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
- access = FILE_MAP_EXECUTE;
- }
+ } else if ( ( flags & PROT_EXEC ) == PROT_EXEC ) {
+ access = FILE_MAP_EXECUTE;
+ }
return access;
}
Modified: trunk/blender/release/plugins/sequence/color-correction-hsv.c
===================================================================
--- trunk/blender/release/plugins/sequence/color-correction-hsv.c
2011-04-21 12:48:07 UTC (rev 36270)
+++ trunk/blender/release/plugins/sequence/color-correction-hsv.c
2011-04-21 13:11:51 UTC (rev 36271)
@@ -196,7 +196,7 @@
src1f= ibuf1->rect_float;
for (y = 0; y < 256; y++) {
- float v = 1.0 * y / 255;
+ float v = 1.0 * y / 255;
v += cast->setup_y;
v *= cast->gain_y;
v = pow(v, cast->gamma_y);
Modified: trunk/blender/release/plugins/sequence/color-correction-yuv.c
===================================================================
--- trunk/blender/release/plugins/sequence/color-correction-yuv.c
2011-04-21 12:48:07 UTC (rev 36270)
+++ trunk/blender/release/plugins/sequence/color-correction-yuv.c
2011-04-21 13:11:51 UTC (rev 36271)
@@ -129,7 +129,7 @@
src1f= ibuf1->rect_float;
for (y = 0; y < 256; y++) {
- float v = 1.0 * y / 255;
+ float v = 1.0 * y / 255;
v += cast->setup_y;
v *= cast->gain_y;
v = pow(v, cast->gamma_y);
Modified: trunk/blender/release/plugins/sequence/dnr.c
===================================================================
--- trunk/blender/release/plugins/sequence/dnr.c 2011-04-21 12:48:07 UTC
(rev 36270)
+++ trunk/blender/release/plugins/sequence/dnr.c 2011-04-21 13:11:51 UTC
(rev 36271)
@@ -66,7 +66,7 @@
}
*table++ = ap;
- }
+ }
}
}
Modified: trunk/blender/release/plugins/sequence/scatter.c
===================================================================
--- trunk/blender/release/plugins/sequence/scatter.c 2011-04-21 12:48:07 UTC
(rev 36270)
+++ trunk/blender/release/plugins/sequence/scatter.c 2011-04-21 13:11:51 UTC
(rev 36271)
@@ -193,9 +193,9 @@
} else {
for (x=0;x < tot;x++) {
rect[0] = (int)(r * 255);
- rect[1] = (int)(g * 255);
- rect[2] = (int)(b * 255);
- rect[3] = (int)(a * 255);
+ rect[1] = (int)(g * 255);
+ rect[2] = (int)(b * 255);
+ rect[3] = (int)(a * 255);
rect += 4;
}
}
Modified: trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
===================================================================
--- trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2011-04-21
12:48:07 UTC (rev 36270)
+++ trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2011-04-21
13:11:51 UTC (rev 36271)
@@ -114,17 +114,17 @@
static unsigned long getipaddress(const char * ipaddr)
{
- struct hostent *host;
- unsigned long ip;
+ struct hostent *host;
+ unsigned long ip;
- if (((ip = inet_addr(ipaddr)) == INADDR_NONE)
- && strcmp(ipaddr, "255.255.255.255") != 0) {
- if ((host = gethostbyname(ipaddr)) != NULL) {
- memcpy(&ip, host->h_addr, sizeof(ip));
- }
- }
+ if (((ip = inet_addr(ipaddr)) == INADDR_NONE)
+ && strcmp(ipaddr, "255.255.255.255") != 0) {
+ if ((host = gethostbyname(ipaddr)) != NULL) {
+ memcpy(&ip, host->h_addr, sizeof(ip));
+ }
+ }
- return (ip);
+ return (ip);
}
static void my_send(SOCKET sock, char * str)
@@ -363,12 +363,12 @@
} while (strcmp(buf, "P6\n") != 0);
do {
- rval = my_gets(s_in, buf, 256);
- } while ( (buf[0] == '#' || buf[0] == '\n') && rval >= 0);
+ rval = my_gets(s_in, buf, 256);
+ } while ( (buf[0] == '#' || buf[0] == '\n') && rval >= 0);
- if (sscanf(buf, "%d %d\n", &width, &height) != 2) {
+ if (sscanf(buf, "%d %d\n", &width, &height) != 2) {
goto errout;
- }
+ }
if (width != c->width || height != c->height) {
goto errout;
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2011-04-21 12:48:07 UTC
(rev 36270)
+++ trunk/blender/source/blender/avi/intern/avi.c 2011-04-21 13:11:51 UTC
(rev 36271)
@@ -402,7 +402,7 @@
/* at least one video track is needed */
return (movie_tracks != 0);
-
+
}
AviError AVI_open_movie (const char *name, AviMovie *movie) {
Modified: trunk/blender/source/blender/avi/intern/codecs.c
===================================================================
--- trunk/blender/source/blender/avi/intern/codecs.c 2011-04-21 12:48:07 UTC
(rev 36270)
+++ trunk/blender/source/blender/avi/intern/codecs.c 2011-04-21 13:11:51 UTC
(rev 36271)
@@ -42,102 +42,102 @@
#include "rgb32.h"
void *avi_format_convert (AviMovie *movie, int stream, void *buffer, AviFormat
from, AviFormat to, int *size) {
- if (from == to)
- return buffer;
-
- if (from != AVI_FORMAT_RGB24 &&
- to != AVI_FORMAT_RGB24)
- return avi_format_convert(movie, stream,
- avi_format_convert (movie, stream, buffer,
from, AVI_FORMAT_RGB24, size),
- AVI_FORMAT_RGB24, to, size);
-
- switch (to) {
- case AVI_FORMAT_RGB24:
- switch (from) {
+ if (from == to)
+ return buffer;
+
+ if (from != AVI_FORMAT_RGB24 &&
+ to != AVI_FORMAT_RGB24)
+ return avi_format_convert(movie, stream,
+ avi_format_convert (movie, stream, buffer, from,
AVI_FORMAT_RGB24, size),
+ AVI_FORMAT_RGB24, to, size);
+
+ switch (to) {
+ case AVI_FORMAT_RGB24:
+ switch (from) {
+ case AVI_FORMAT_AVI_RGB:
+ buffer = avi_converter_from_avi_rgb (movie, stream,
buffer, size);
+ break;
+ case AVI_FORMAT_MJPEG:
+ buffer = avi_converter_from_mjpeg (movie, stream,
buffer, size);
+ break;
+ case AVI_FORMAT_RGB32:
+ buffer = avi_converter_from_rgb32 (movie, stream,
buffer, size);
+ break;
+ default:
+ break;
+ }
+ break;
case AVI_FORMAT_AVI_RGB:
- buffer = avi_converter_from_avi_rgb (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_avi_rgb (movie, stream, buffer, size);
+ break;
case AVI_FORMAT_MJPEG:
- buffer = avi_converter_from_mjpeg (movie, stream, buffer, size);
- break;
+ buffer = avi_converter_to_mjpeg (movie, stream, buffer, size);
+ break;
case AVI_FORMAT_RGB32:
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
