[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51840] trunk/blender: style cleanup: tabs & whitespace
Campbell Barton
ideasman42 at gmail.com
Sat Nov 3 16:35:06 CET 2012
Revision: 51840
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51840
Author: campbellbarton
Date: 2012-11-03 15:35:03 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
style cleanup: tabs & whitespace
Modified Paths:
--------------
trunk/blender/intern/bsp/extern/CSG_BooleanOps.h
trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
trunk/blender/intern/ffmpeg/ffmpeg_compat.h
trunk/blender/intern/utfconv/utfconv.h
trunk/blender/source/blender/blenkernel/BKE_subsurf.h
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
trunk/blender/source/blender/editors/include/ED_mask.h
trunk/blender/source/blender/editors/mesh/CMakeLists.txt
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_view3d/drawobject.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/imbuf/intern/dds/Common.h
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/makesrna/intern/rna_material.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/python/generic/idprop_py_api.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
trunk/blender/source/gameengine/Ketsji/KX_IPO_SGController.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
trunk/blender/source/gameengine/VideoTexture/FilterSource.h
trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
Modified: trunk/blender/intern/bsp/extern/CSG_BooleanOps.h
===================================================================
--- trunk/blender/intern/bsp/extern/CSG_BooleanOps.h 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/intern/bsp/extern/CSG_BooleanOps.h 2012-11-03 15:35:03 UTC (rev 51840)
@@ -61,9 +61,9 @@
#endif
typedef struct {
- int vertex_index[4];
- int vertex_number;
- int orig_face;
+ int vertex_index[4];
+ int vertex_number;
+ int orig_face;
} CSG_IFace;
/**
@@ -72,7 +72,7 @@
*/
typedef struct {
- float position[3];
+ float position[3];
} CSG_IVertex;
/**
Modified: trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
===================================================================
--- trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp 2012-11-03 15:35:03 UTC (rev 51840)
@@ -135,10 +135,10 @@
static inline bool Carve_facesAreCoplanar(const MeshSet<3>::face_t *a, const MeshSet<3>::face_t *b)
{
- carve::geom3d::Ray temp;
- // XXX: Find a better definition. This may be a source of problems
- // if floating point inaccuracies cause an incorrect answer.
- return !carve::geom3d::planeIntersection(a->plane, b->plane, temp);
+ carve::geom3d::Ray temp;
+ // XXX: Find a better definition. This may be a source of problems
+ // if floating point inaccuracies cause an incorrect answer.
+ return !carve::geom3d::planeIntersection(a->plane, b->plane, temp);
}
static bool Carve_checkMeshSetInterseciton_do(carve::csg::Intersections &intersections,
Modified: trunk/blender/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/intern/ffmpeg/ffmpeg_compat.h 2012-11-03 15:35:03 UTC (rev 51840)
@@ -110,7 +110,7 @@
#endif
/* there are some version inbetween, which have avio_... functions but no
- AVIO_FLAG_... */
+ * AVIO_FLAG_... */
#ifndef AVIO_FLAG_WRITE
#define AVIO_FLAG_WRITE URL_WRONLY
#endif
Modified: trunk/blender/intern/utfconv/utfconv.h
===================================================================
--- trunk/blender/intern/utfconv/utfconv.h 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/intern/utfconv/utfconv.h 2012-11-03 15:35:03 UTC (rev 51840)
@@ -95,7 +95,7 @@
wchar_t *in8str ## _16 = alloc_utf16_from_8((char *)in8str, 0)
#define UTF16_UN_ENCODE(in8str) \
- free(in8str ## _16); } (void)0
+ free(in8str ## _16); } (void)0
#ifdef __cplusplus
}
Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2012-11-03 15:35:03 UTC (rev 51840)
@@ -64,10 +64,10 @@
} SubsurfFlags;
struct DerivedMesh *subsurf_make_derived_from_derived(
- struct DerivedMesh *dm,
- struct SubsurfModifierData *smd,
- float (*vertCos)[3],
- SubsurfFlags flags);
+ struct DerivedMesh *dm,
+ struct SubsurfModifierData *smd,
+ float (*vertCos)[3],
+ SubsurfFlags flags);
void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]);
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-11-03 15:35:03 UTC (rev 51840)
@@ -2823,7 +2823,7 @@
}
/* Disabled this code; this is being called on scene_update_tagged, and that in turn gets called on
- every user action changing stuff, and then it runs a complete bake??? (ton) */
+ * every user action changing stuff, and then it runs a complete bake??? (ton) */
/* Baking */
void BKE_ptcache_quick_cache_all(Main *bmain, Scene *scene)
Modified: trunk/blender/source/blender/blenlib/intern/string_utf8.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/blenlib/intern/string_utf8.c 2012-11-03 15:35:03 UTC (rev 51840)
@@ -157,14 +157,14 @@
* note: this looks to be at odd's with 'trailingBytesForUTF8',
* need to find out what gives here! - campbell */
static const size_t utf8_skip_data[256] = {
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 1, 1
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 1, 1
};
#define BLI_STR_UTF8_CPY(dst, src, maxncpy) \
Modified: trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/compositor/operations/COM_OutputFileOperation.cpp 2012-11-03 15:35:03 UTC (rev 51840)
@@ -94,8 +94,8 @@
OutputSingleLayerOperation::OutputSingleLayerOperation(
- const RenderData *rd, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path,
- const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings)
+ const RenderData *rd, const bNodeTree *tree, DataType datatype, ImageFormatData *format, const char *path,
+ const ColorManagedViewSettings *viewSettings, const ColorManagedDisplaySettings *displaySettings)
{
this->m_rd = rd;
this->m_tree = tree;
Modified: trunk/blender/source/blender/editors/include/ED_mask.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_mask.h 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/editors/include/ED_mask.h 2012-11-03 15:35:03 UTC (rev 51840)
@@ -88,8 +88,8 @@
void copy_gpdata(void);
void paste_gpdata(void);
- void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
- void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
+void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
+void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
#endif
#endif /* __ED_MASK_H__ */
Modified: trunk/blender/source/blender/editors/mesh/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/editors/mesh/CMakeLists.txt 2012-11-03 15:35:03 UTC (rev 51840)
@@ -74,7 +74,7 @@
endif()
if(WITH_BULLET)
- add_definitions(-DWITH_BULLET)
+ add_definitions(-DWITH_BULLET)
endif()
blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-11-03 15:35:03 UTC (rev 51840)
@@ -1393,10 +1393,10 @@
row = uiLayoutRow(layout, TRUE);
- if(RNA_enum_get(ptr, "mode") == NODE_SCRIPT_INTERNAL)
+ if (RNA_enum_get(ptr, "mode") == NODE_SCRIPT_INTERNAL)
uiItemR(row, ptr, "script", 0, "", ICON_NONE);
else
- uiItemR(row, ptr, "filepath", 0,"", ICON_NONE);
+ uiItemR(row, ptr, "filepath", 0, "", ICON_NONE);
uiItemO(row, "", ICON_FILE_REFRESH, "node.shader_script_update");
}
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2012-11-03 15:05:09 UTC (rev 51839)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2012-11-03 15:35:03 UTC (rev 51840)
@@ -2158,21 +2158,22 @@
Text *text;
/* test if we have a render engine that supports shaders scripts */
- if(!(type && type->update_script_node))
+ if (!(type && type->update_script_node))
return 0;
/* see if we have a shader script node in context */
node = CTX_data_pointer_get_type(C, "node", &RNA_ShaderNodeScript).data;
- if(node && node->type == SH_NODE_SCRIPT) {
+ if (node && node->type == SH_NODE_SCRIPT) {
NodeShaderScript *nss = node->storage;
- if(node->id || nss->filepath[0])
+ if (node->id || nss->filepath[0]) {
return 1;
+ }
}
/* see if we have a text datablock in context */
text = CTX_data_pointer_get_type(C, "edit_text", &RNA_Text).data;
- if(text)
+ if (text)
return 1;
/* we don't check if text datablock is actually in use, too slow for poll */
@@ -2186,8 +2187,8 @@
bNode *node;
/* update each script that is using this text datablock */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list