[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46161] trunk/blender/source: style cleanup: guys - set your editors to tabs!
Campbell Barton
ideasman42 at gmail.com
Tue May 1 19:51:03 CEST 2012
Revision: 46161
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46161
Author: campbellbarton
Date: 2012-05-01 17:51:03 +0000 (Tue, 01 May 2012)
Log Message:
-----------
style cleanup: guys - set your editors to tabs!
Modified Paths:
--------------
trunk/blender/source/blender/avi/AVI_avi.h
trunk/blender/source/blender/blenkernel/BKE_ocean.h
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenlib/intern/winstuff.c
trunk/blender/source/blender/bmesh/intern/bmesh_private.h
trunk/blender/source/blender/bmesh/operators/bmo_hull.c
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_scopes.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/imbuf/intern/dds/ColorBlock.h
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_test.c
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/modifiers/intern/MOD_meshdeform.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/gameengine/Converter/KX_ConvertProperties.h
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.h
Modified: trunk/blender/source/blender/avi/AVI_avi.h
===================================================================
--- trunk/blender/source/blender/avi/AVI_avi.h 2012-05-01 17:44:00 UTC (rev 46160)
+++ trunk/blender/source/blender/avi/AVI_avi.h 2012-05-01 17:51:03 UTC (rev 46161)
@@ -57,124 +57,124 @@
#include <stdio.h> /* for FILE */
typedef struct _AviChunk {
- int fcc;
- int size;
+ int fcc;
+ int size;
} AviChunk;
typedef struct _AviList {
- int fcc;
- int size;
- int ids;
+ int fcc;
+ int size;
+ int ids;
} AviList;
typedef struct _AviMainHeader {
- int fcc;
- int size;
- int MicroSecPerFrame; /* MicroSecPerFrame - timing between frames */
- int MaxBytesPerSec; /* MaxBytesPerSec - approx bps system must handle */
- int PaddingGranularity;
- int Flags;
+ int fcc;
+ int size;
+ int MicroSecPerFrame; /* MicroSecPerFrame - timing between frames */
+ int MaxBytesPerSec; /* MaxBytesPerSec - approx bps system must handle */
+ int PaddingGranularity;
+ int Flags;
#define AVIF_HASINDEX 0x00000010 /* had idx1 chunk */
#define AVIF_MUSTUSEINDEX 0x00000020 /* must use idx1 chunk to determine order */
#define AVIF_ISINTERLEAVED 0x00000100 /* AVI file is interleaved */
#define AVIF_TRUSTCKTYPE 0x00000800
#define AVIF_WASCAPTUREFILE 0x00010000 /* specially allocated used for capturing real time video */
#define AVIF_COPYRIGHTED 0x00020000 /* contains copyrighted data */
-
- int TotalFrames;
- int InitialFrames; /* InitialFrames - initial frame before interleaving */
- int Streams;
- int SuggestedBufferSize;
- int Width;
- int Height;
- int Reserved[4];
+
+ int TotalFrames;
+ int InitialFrames; /* InitialFrames - initial frame before interleaving */
+ int Streams;
+ int SuggestedBufferSize;
+ int Width;
+ int Height;
+ int Reserved[4];
} AviMainHeader;
typedef struct _AviStreamHeader {
- int fcc;
- int size;
- int Type;
+ int fcc;
+ int size;
+ int Type;
#define AVIST_VIDEO FCC("vids")
#define AVIST_AUDIO FCC("auds")
#define AVIST_MIDI FCC("mids")
#define AVIST_TEXT FCC("txts")
-
- int Handler;
- int Flags;
+
+ int Handler;
+ int Flags;
#define AVISF_DISABLED 0x00000001
#define AVISF_VIDEO_PALCHANGES 0x00010000
-
- short Priority;
- short Language;
- int InitialFrames;
- int Scale;
- int Rate;
- int Start;
- int Length;
- int SuggestedBufferSize;
- int Quality;
- int SampleSize;
- short left;
- short top;
- short right;
- short bottom;
+
+ short Priority;
+ short Language;
+ int InitialFrames;
+ int Scale;
+ int Rate;
+ int Start;
+ int Length;
+ int SuggestedBufferSize;
+ int Quality;
+ int SampleSize;
+ short left;
+ short top;
+ short right;
+ short bottom;
} AviStreamHeader;
typedef struct _AviBitmapInfoHeader {
- int fcc;
- int size;
- int Size;
- int Width;
- int Height;
- short Planes;
- short BitCount;
- int Compression;
- int SizeImage;
- int XPelsPerMeter;
- int YPelsPerMeter;
- int ClrUsed;
- int ClrImportant;
+ int fcc;
+ int size;
+ int Size;
+ int Width;
+ int Height;
+ short Planes;
+ short BitCount;
+ int Compression;
+ int SizeImage;
+ int XPelsPerMeter;
+ int YPelsPerMeter;
+ int ClrUsed;
+ int ClrImportant;
} AviBitmapInfoHeader;
typedef struct _AviMJPEGUnknown {
- int a;
- int b;
- int c;
- int d;
- int e;
- int f;
- int g;
+ int a;
+ int b;
+ int c;
+ int d;
+ int e;
+ int f;
+ int g;
} AviMJPEGUnknown;
typedef struct _AviIndexEntry {
- int ChunkId;
- int Flags;
+ int ChunkId;
+ int Flags;
#define AVIIF_LIST 0x00000001
#define AVIIF_KEYFRAME 0x00000010
#define AVIIF_NO_TIME 0x00000100
#define AVIIF_COMPRESSOR 0x0FFF0000
- int Offset;
- int Size;
+ int Offset;
+ int Size;
} AviIndexEntry;
typedef struct _AviIndex {
- int fcc;
- int size;
- AviIndexEntry *entrys;
+ int fcc;
+ int size;
+ AviIndexEntry *entrys;
} AviIndex;
typedef enum {
- AVI_FORMAT_RGB24, /* The most basic of forms, 3 bytes per pixel, 1 per r, g, b */
- AVI_FORMAT_RGB32, /* The second most basic of forms, 4 bytes per pixel, 1 per r, g, b, alpha */
- AVI_FORMAT_AVI_RGB, /* Same as above, but is in the weird AVI order (bottom to top, left to right) */
- AVI_FORMAT_MJPEG /* Motion-JPEG */
+ AVI_FORMAT_RGB24, /* The most basic of forms, 3 bytes per pixel, 1 per r, g, b */
+ AVI_FORMAT_RGB32, /* The second most basic of forms, 4 bytes per pixel, 1 per r, g, b, alpha */
+ AVI_FORMAT_AVI_RGB, /* Same as above, but is in the weird AVI order (bottom to top, left to right) */
+ AVI_FORMAT_MJPEG /* Motion-JPEG */
} AviFormat;
typedef struct _AviStreamRec {
- AviStreamHeader sh;
- void *sf;
- int sf_size;
- AviFormat format;
+ AviStreamHeader sh;
+ void *sf;
+ int sf_size;
+ AviFormat format;
} AviStreamRec;
typedef struct _AviMovie {
@@ -201,23 +201,23 @@
} AviMovie;
typedef enum {
- AVI_ERROR_NONE=0,
- AVI_ERROR_COMPRESSION,
- AVI_ERROR_OPEN,
- AVI_ERROR_READING,
- AVI_ERROR_WRITING,
- AVI_ERROR_FORMAT,
- AVI_ERROR_ALLOC,
- AVI_ERROR_FOUND,
- AVI_ERROR_OPTION
+ AVI_ERROR_NONE=0,
+ AVI_ERROR_COMPRESSION,
+ AVI_ERROR_OPEN,
+ AVI_ERROR_READING,
+ AVI_ERROR_WRITING,
+ AVI_ERROR_FORMAT,
+ AVI_ERROR_ALLOC,
+ AVI_ERROR_FOUND,
+ AVI_ERROR_OPTION
} AviError;
/* belongs to the option-setting function. */
typedef enum {
- AVI_OPTION_WIDTH=0,
- AVI_OPTION_HEIGHT,
- AVI_OPTION_QUALITY,
- AVI_OPTION_FRAMERATE
+ AVI_OPTION_WIDTH=0,
+ AVI_OPTION_HEIGHT,
+ AVI_OPTION_QUALITY,
+ AVI_OPTION_FRAMERATE
} AviOption;
/* The offsets that will always stay the same in AVI files we
@@ -306,4 +306,3 @@
void AVI_set_debug(int mode);
#endif /* __AVI_AVI_H__ */
-
Modified: trunk/blender/source/blender/blenkernel/BKE_ocean.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_ocean.h 2012-05-01 17:44:00 UTC (rev 46160)
+++ trunk/blender/source/blender/blenkernel/BKE_ocean.h 2012-05-01 17:51:03 UTC (rev 46161)
@@ -32,17 +32,16 @@
typedef struct OceanResult {
float disp[3];
- float normal[3];
+ float normal[3];
float foam;
/* raw eigenvalues/vectors */
float Jminus;
- float Jplus;
+ float Jplus;
float Eminus[3];
- float Eplus[3];
+ float Eplus[3];
} OceanResult;
-
-
+
typedef struct OceanCache {
struct ImBuf **ibufs_disp;
struct ImBuf **ibufs_foam;
@@ -74,7 +73,6 @@
#define OCEAN_CACHING 1
#define OCEAN_CACHED 2
-
struct Ocean *BKE_add_ocean(void);
void BKE_free_ocean_data(struct Ocean *oc);
void BKE_free_ocean(struct Ocean *oc);
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-01 17:44:00 UTC (rev 46160)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-05-01 17:51:03 UTC (rev 46161)
@@ -1046,7 +1046,7 @@
{sizeof(float), "", 0, "BevelWeight", NULL, NULL, layerInterp_bweight},
/* 30: CD_CREASE */
{sizeof(float), "", 0, "SubSurfCrease", NULL, NULL, layerInterp_bweight},
- /* 31: CD_ORIGSPACE_MLOOP */
+ /* 31: CD_ORIGSPACE_MLOOP */
{sizeof(OrigSpaceLoop), "OrigSpaceLoop", 1, "OS Loop", NULL, NULL, layerInterp_mloop_origspace, NULL, NULL,
layerEqual_mloop_origspace, layerMultiply_mloop_origspace, layerInitMinMax_mloop_origspace,
layerAdd_mloop_origspace, layerDoMinMax_mloop_origspace, layerCopyValue_mloop_origspace},
Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-01 17:44:00 UTC (rev 46160)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c 2012-05-01 17:51:03 UTC (rev 46161)
@@ -150,8 +150,8 @@
#define SOFTGOALSNAP 0.999f
/* if bp-> goal is above make it a *forced follow original* and skip all ODE stuff for this bp
- removes *unnecessary* stiffnes from ODE system
-*/
+ * removes *unnecessary* stiffnes from ODE system
+ */
#define HEUNWARNLIMIT 1 /* 500 would be fine i think for detecting severe *stiff* stuff */
@@ -179,16 +179,16 @@
static float sb_grav_force_scale(Object *UNUSED(ob))
/* since unit of g is [m/sec^2] and F = mass * g we rescale unit mass of node to 1 gramm
- put it to a function here, so we can add user options later without touching simulation code
-*/
+ * put it to a function here, so we can add user options later without touching simulation code
+ */
{
return (0.001f);
}
static float sb_fric_force_scale(Object *UNUSED(ob))
/* rescaling unit of drag [1 / sec] to somehow reasonable
- put it to a function here, so we can add user options later without touching simulation code
-*/
+ * put it to a function here, so we can add user options later without touching simulation code
+ */
{
return (0.01f);
}
@@ -216,12 +216,12 @@
/* helper functions for everything is animatable jow_go_for2_5 +++++++*/
/* introducing them here, because i know: steps in properties ( at frame timing )
- will cause unwanted responses of the softbody system (which does inter frame calculations )
- so first 'cure' would be: interpolate linear in time ..
- Q: why do i write this?
- A: because it happend once, that some eger coder 'streamlined' code to fail.
- We DO linear interpolation for goals .. and i think we should do on animated properties as well
-*/
+ * will cause unwanted responses of the softbody system (which does inter frame calculations )
+ * so first 'cure' would be: interpolate linear in time ..
+ * Q: why do i write this?
+ * A: because it happend once, that some eger coder 'streamlined' code to fail.
+ * We DO linear interpolation for goals .. and i think we should do on animated properties as well
+ */
/* animate sb->maxgoal, sb->mingoal */
static float _final_goal(Object *ob, BodyPoint *bp)/*jow_go_for2_5 */
@@ -2984,10 +2984,10 @@
maxerrpos = MAX2(maxerrpos, ABS(dx[1] - bp->prevdx[1]));
maxerrpos = MAX2(maxerrpos, ABS(dx[2] - bp->prevdx[2]));
-/* bp->choke is set when we need to pull a vertex or edge out of the collider.
- the collider object signals to get out by pushing hard. on the other hand
- we don't want to end up in deep space so we add some <viscosity>
- to balance that out */
+ /* bp->choke is set when we need to pull a vertex or edge out of the collider.
+ * the collider object signals to get out by pushing hard. on the other hand
+ * we don't want to end up in deep space so we add some <viscosity>
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list