Revision: 40838 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40838 Author: campbellbarton Date: 2011-10-06 22:04:01 +0000 (Thu, 06 Oct 2011) Log Message: ----------- spaces -> tabs (whitespace only changes)
Modified Paths: -------------- trunk/blender/source/blender/editors/space_node/drawnode.c trunk/blender/source/blender/editors/space_view3d/drawarmature.c trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp trunk/blender/source/blender/python/intern/bpy_app_handlers.c trunk/blender/source/blender/python/intern/bpy_props.c trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h trunk/blender/source/gameengine/Expressions/PyObjectPlus.h trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h trunk/blender/source/gameengine/Ketsji/KX_Dome.h trunk/blender/source/gameengine/Ketsji/KX_OrientationInterpolator.h trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h trunk/blender/source/gameengine/SceneGraph/SG_DList.h trunk/blender/source/gameengine/VideoTexture/ImageRender.h trunk/blender/source/gameengine/VideoTexture/ImageViewport.h Modified: trunk/blender/source/blender/editors/space_node/drawnode.c =================================================================== --- trunk/blender/source/blender/editors/space_node/drawnode.c 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/blender/editors/space_node/drawnode.c 2011-10-06 22:04:01 UTC (rev 40838) @@ -1939,7 +1939,7 @@ /* only once called */ static void node_texture_set_butfunc(bNodeType *ntype) { - ntype->uifuncbut = NULL; + ntype->uifuncbut = NULL; if( ntype->type >= TEX_NODE_PROC && ntype->type < TEX_NODE_PROC_MAX ) { ntype->uifunc = node_texture_buts_proc; } Modified: trunk/blender/source/blender/editors/space_view3d/drawarmature.c =================================================================== --- trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/blender/editors/space_view3d/drawarmature.c 2011-10-06 22:04:01 UTC (rev 40838) @@ -438,39 +438,39 @@ } static float bone_octahedral_verts[6][3]= { - { 0.0f, 0.0f, 0.0f}, - { 0.1f, 0.1f, 0.1f}, - { 0.1f, 0.1f, -0.1f}, - {-0.1f, 0.1f, -0.1f}, - {-0.1f, 0.1f, 0.1f}, - { 0.0f, 1.0f, 0.0f} + { 0.0f, 0.0f, 0.0f}, + { 0.1f, 0.1f, 0.1f}, + { 0.1f, 0.1f, -0.1f}, + {-0.1f, 0.1f, -0.1f}, + {-0.1f, 0.1f, 0.1f}, + { 0.0f, 1.0f, 0.0f} }; static unsigned int bone_octahedral_wire_sides[8]= {0, 1, 5, 3, 0, 4, 5, 2}; static unsigned int bone_octahedral_wire_square[8]= {1, 2, 3, 4, 1}; static unsigned int bone_octahedral_solid_tris[8][3]= { - {2, 1, 0}, /* bottom */ - {3, 2, 0}, - {4, 3, 0}, - {1, 4, 0}, + {2, 1, 0}, /* bottom */ + {3, 2, 0}, + {4, 3, 0}, + {1, 4, 0}, - {5, 1, 2}, /* top */ - {5, 2, 3}, - {5, 3, 4}, - {5, 4, 1} + {5, 1, 2}, /* top */ + {5, 2, 3}, + {5, 3, 4}, + {5, 4, 1} }; /* aligned with bone_octahedral_solid_tris */ static float bone_octahedral_solid_normals[8][3]= { - { 0.70710683f, -0.70710683f, 0.00000000f}, - {-0.00000000f, -0.70710683f, -0.70710683f}, - {-0.70710683f, -0.70710683f, 0.00000000f}, - { 0.00000000f, -0.70710683f, 0.70710683f}, - { 0.99388373f, 0.11043154f, -0.00000000f}, - { 0.00000000f, 0.11043154f, -0.99388373f}, - {-0.99388373f, 0.11043154f, 0.00000000f}, - { 0.00000000f, 0.11043154f, 0.99388373f} + { 0.70710683f, -0.70710683f, 0.00000000f}, + {-0.00000000f, -0.70710683f, -0.70710683f}, + {-0.70710683f, -0.70710683f, 0.00000000f}, + { 0.00000000f, -0.70710683f, 0.70710683f}, + { 0.99388373f, 0.11043154f, -0.00000000f}, + { 0.00000000f, 0.11043154f, -0.99388373f}, + {-0.99388373f, 0.11043154f, 0.00000000f}, + { 0.00000000f, 0.11043154f, 0.99388373f} }; static void draw_bone_octahedral(void) Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp =================================================================== --- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2011-10-06 22:04:01 UTC (rev 40838) @@ -98,7 +98,7 @@ public: Mem_IStream (unsigned char *exrbuf, size_t exrsize): - IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; } + IStream("dummy"), _exrpos (0), _exrsize(exrsize) { _exrbuf = exrbuf; } virtual bool read (char c[], int n); virtual Int64 tellg (); @@ -107,8 +107,8 @@ //virtual ~Mem_IStream() {}; // unused private: - - Int64 _exrpos; + + Int64 _exrpos; Int64 _exrsize; unsigned char *_exrbuf; }; @@ -116,11 +116,11 @@ bool Mem_IStream::read (char c[], int n) { if (n + _exrpos <= _exrsize) - { + { memcpy(c, (void *)(&_exrbuf[_exrpos]), n); _exrpos += n; return true; - } + } else return false; } @@ -308,7 +308,7 @@ delete [] pixels; } catch (const std::exception &exc) - { + { printf("OpenEXR-save: ERROR: %s\n", exc.what()); if (ibuf) IMB_freeImBuf(ibuf); @@ -365,7 +365,7 @@ delete file; } catch (const std::exception &exc) - { + { printf("OpenEXR-save: ERROR: %s\n", exc.what()); if (ibuf) IMB_freeImBuf(ibuf); Modified: trunk/blender/source/blender/python/intern/bpy_app_handlers.c =================================================================== --- trunk/blender/source/blender/python/intern/bpy_app_handlers.c 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/blender/python/intern/bpy_app_handlers.c 2011-10-06 22:04:01 UTC (rev 40838) @@ -40,7 +40,7 @@ static PyTypeObject BlenderAppCbType; static PyStructSequence_Field app_cb_info_fields[]= { - {(char *)"frame_change_pre", NULL}, + {(char *)"frame_change_pre", NULL}, {(char *)"frame_change_post", NULL}, {(char *)"render_pre", NULL}, {(char *)"render_post", NULL}, Modified: trunk/blender/source/blender/python/intern/bpy_props.c =================================================================== --- trunk/blender/source/blender/python/intern/bpy_props.c 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/blender/python/intern/bpy_props.c 2011-10-06 22:04:01 UTC (rev 40838) @@ -56,13 +56,13 @@ static EnumPropertyItem property_flag_items[]= { {PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""}, - {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, + {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem property_flag_enum_items[]= { {PROP_HIDDEN, "HIDDEN", 0, "Hidden", ""}, - {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, + {PROP_SKIP_SAVE, "SKIP_SAVE", 0, "Skip Save", ""}, {PROP_ANIMATABLE, "ANIMATABLE", 0, "Animateable", ""}, {PROP_ENUM_FLAG, "ENUM_FLAG", 0, "Enum Flag", ""}, {0, NULL, 0, NULL, NULL}}; @@ -72,7 +72,7 @@ {PROP_FILEPATH, "FILE_PATH", 0, "File Path", ""}, {PROP_DIRPATH, "DIR_PATH", 0, "Directory Path", ""}, {PROP_FILENAME, "FILENAME", 0, "Filename", ""}, - {PROP_TRANSLATE, "TRANSLATE", 0, "Translate", ""}, + {PROP_TRANSLATE, "TRANSLATE", 0, "Translate", ""}, {PROP_NONE, "NONE", 0, "None", ""}, {0, NULL, 0, NULL, NULL}}; Modified: trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h =================================================================== --- trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/gameengine/Converter/BlenderWorldInfo.h 2011-10-06 22:04:01 UTC (rev 40838) @@ -54,22 +54,22 @@ ~BlenderWorldInfo(); bool hasWorld(); - bool hasMist(); - float getBackColorRed(); - float getBackColorGreen(); - float getBackColorBlue(); + bool hasMist(); + float getBackColorRed(); + float getBackColorGreen(); + float getBackColorBlue(); float getAmbientColorRed(); float getAmbientColorGreen(); float getAmbientColorBlue(); - float getMistStart(); - float getMistDistance(); - float getMistColorRed(); - float getMistColorGreen(); - float getMistColorBlue(); + float getMistStart(); + float getMistDistance(); + float getMistColorRed(); + float getMistColorGreen(); + float getMistColorBlue(); - void + void setBackColor( float r, float g, Modified: trunk/blender/source/gameengine/Expressions/PyObjectPlus.h =================================================================== --- trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/gameengine/Expressions/PyObjectPlus.h 2011-10-06 22:04:01 UTC (rev 40838) @@ -215,7 +215,7 @@ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(...) - " BGE_PROXY_ERROR_MSG); return NULL; } \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(args, kwds); \ }; \ - static const char method_name##_doc[]; \ + static const char method_name##_doc[]; \ #define KX_PYMETHOD_DOC_VARARGS(class_name, method_name) \ PyObject* Py##method_name(PyObject* args); \ @@ -223,7 +223,7 @@ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(...) - " BGE_PROXY_ERROR_MSG); return NULL; } \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(args); \ }; \ - static const char method_name##_doc[]; \ + static const char method_name##_doc[]; \ #define KX_PYMETHOD_DOC_O(class_name, method_name) \ PyObject* Py##method_name(PyObject* value); \ @@ -231,7 +231,7 @@ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "(value) - " BGE_PROXY_ERROR_MSG); return NULL; } \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(value); \ }; \ - static const char method_name##_doc[]; \ + static const char method_name##_doc[]; \ #define KX_PYMETHOD_DOC_NOARGS(class_name, method_name) \ PyObject* Py##method_name(); \ @@ -239,7 +239,7 @@ if(BGE_PROXY_REF(self)==NULL) { PyErr_SetString(PyExc_RuntimeError, #class_name "." #method_name "() - " BGE_PROXY_ERROR_MSG); return NULL; } \ return ((class_name*)BGE_PROXY_REF(self))->Py##method_name(); \ }; \ - static const char method_name##_doc[]; \ + static const char method_name##_doc[]; \ /* The line above should remain empty */ Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp =================================================================== --- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp 2011-10-06 22:04:01 UTC (rev 40838) @@ -134,7 +134,7 @@ PyMethodDef SCA_2DFilterActuator::Methods[] = { /* add python functions to deal with m_msg... */ - {NULL,NULL} + {NULL,NULL} }; PyAttributeDef SCA_2DFilterActuator::Attributes[] = { Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h =================================================================== --- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h 2011-10-06 22:02:50 UTC (rev 40837) +++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h 2011-10-06 22:04:01 UTC (rev 40838) @@ -38,7 +38,7 @@ class SCA_2DFilterActuator : public SCA_IActuator { - Py_Header; + Py_Header; private: vector<STR_String> m_propNames; Modified: trunk/blender/source/gameengine/Ketsji/KX_Dome.h =================================================================== @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs