spaces -> tabs (whitespace only changes)
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Oct 2011 22:04:01 +0000 (22:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Oct 2011 22:04:01 +0000 (22:04 +0000)
19 files changed:
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/imbuf/intern/openexr/openexr_api.cpp
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/intern/bpy_props.c
source/gameengine/Converter/BlenderWorldInfo.h
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
source/gameengine/GameLogic/SCA_2DFilterActuator.h
source/gameengine/Ketsji/KX_Dome.h
source/gameengine/Ketsji/KX_OrientationInterpolator.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/SceneGraph/SG_DList.h
source/gameengine/VideoTexture/ImageRender.h
source/gameengine/VideoTexture/ImageViewport.h

index 5f44350..150847c 100644 (file)
@@ -1939,7 +1939,7 @@ static void node_texture_buts_output(uiLayout *layout, bContext *UNUSED(C), Poin
 /* 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;
        }
index 3f45e32..83a695b 100644 (file)
@@ -438,39 +438,39 @@ static void draw_bonevert_solid(void)
 }
 
 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},
-
-    {5, 1, 2}, /* top */
-    {5, 2, 3},
-    {5, 3, 4},
-    {5, 4, 1}
+       {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}
 };
 
 /* 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)
index 88f6508..e064d7f 100644 (file)
@@ -98,7 +98,7 @@ class Mem_IStream: public IStream
 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 @@ public:
        //virtual ~Mem_IStream() {}; // unused
        
 private:
-               
-               Int64 _exrpos;
+
+       Int64 _exrpos;
        Int64 _exrsize;
        unsigned char *_exrbuf;
 };
@@ -116,11 +116,11 @@ private:
 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 @@ static int imb_save_openexr_half(struct ImBuf *ibuf, const char *name, int flags
                delete [] pixels;
        }
        catch (const std::exception &exc)
-       {      
+       {
                printf("OpenEXR-save: ERROR: %s\n", exc.what());
                if (ibuf) IMB_freeImBuf(ibuf);
                
@@ -365,7 +365,7 @@ static int imb_save_openexr_float(struct ImBuf *ibuf, const char *name, int flag
                delete file;
        }
        catch (const std::exception &exc)
-       {      
+       {
                printf("OpenEXR-save: ERROR: %s\n", exc.what());
                if (ibuf) IMB_freeImBuf(ibuf);
                
index 6aaeb4d..cd3d784 100644 (file)
@@ -40,7 +40,7 @@ void bpy_app_generic_callback(struct Main *main, struct ID *id, void *arg);
 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},
index 88383ce..5c66859 100644 (file)
@@ -56,13 +56,13 @@ extern BPy_StructRNA *bpy_context_module;
 
 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 @@ static EnumPropertyItem property_subtype_string_items[]= {
        {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}};
index e7b8784..45737bd 100644 (file)
@@ -54,22 +54,22 @@ public:
        ~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,
index d3b2eac..dd4c9a8 100644 (file)
@@ -215,7 +215,7 @@ typedef struct PyObjectPlus_Proxy {
                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 @@ typedef struct PyObjectPlus_Proxy {
                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 @@ typedef struct PyObjectPlus_Proxy {
                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 @@ typedef struct PyObjectPlus_Proxy {
                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 */
index 7c1824c..33d7ec5 100644 (file)
@@ -134,7 +134,7 @@ PyTypeObject SCA_2DFilterActuator::Type = {
 
 PyMethodDef SCA_2DFilterActuator::Methods[] = {
        /* add python functions to deal with m_msg... */
-    {NULL,NULL}
+       {NULL,NULL}
 };
 
 PyAttributeDef SCA_2DFilterActuator::Attributes[] = {
index 82c82ac..0139683 100644 (file)
@@ -38,7 +38,7 @@
 
 class SCA_2DFilterActuator : public SCA_IActuator
 {
-    Py_Header;
+       Py_Header;
 
 private:
        vector<STR_String> m_propNames;
index 844f40f..009fb0b 100644 (file)
@@ -57,22 +57,21 @@ class KX_Dome
 {
 public:
        /// constructor
-       KX_Dome (
-       RAS_ICanvas* m_canvas,
-    /// rasterizer
-    RAS_IRasterizer* m_rasterizer,
-    /// render tools
-    RAS_IRenderTools* m_rendertools,
-    /// engine
-    KX_KetsjiEngine* m_engine,
-
-       short res,
-       short mode,
-       short angle,
-       float resbuf,
-       short tilt,
-       struct Text* warptext
-       );
+       KX_Dome (RAS_ICanvas* m_canvas,
+                /// rasterizer
+                RAS_IRasterizer* m_rasterizer,
+                /// render tools
+                RAS_IRenderTools* m_rendertools,
+                /// engine
+                KX_KetsjiEngine* m_engine,
+
+                short res,
+                short mode,
+                short angle,
+                float resbuf,
+                short tilt,
+                struct Text* warptext
+                );
 
        /// destructor
        virtual ~KX_Dome (void);
@@ -180,14 +179,14 @@ protected:
        /// rendered scene
        KX_Scene * m_scene;
 
-    /// canvas
-    RAS_ICanvas* m_canvas;
-    /// rasterizer
-    RAS_IRasterizer* m_rasterizer;
-    /// render tools
-    RAS_IRenderTools* m_rendertools;
-    /// engine
-    KX_KetsjiEngine* m_engine;
+       /// canvas
+       RAS_ICanvas* m_canvas;
+       /// rasterizer
+       RAS_IRasterizer* m_rasterizer;
+       /// render tools
+       RAS_IRenderTools* m_rendertools;
+       /// engine
+       KX_KetsjiEngine* m_engine;
        
        
 #ifdef WITH_CXX_GUARDEDALLOC
index 2ae7b00..8bbe888 100644 (file)
@@ -41,12 +41,12 @@ class KX_IScalarInterpolator;
 
 class KX_OrientationInterpolator : public KX_IInterpolator {
 public:
-       KX_OrientationInterpolator(MT_Matrix3x3& target, 
-                                                          KX_IScalarInterpolator **ipos)
-               : m_target(target) 
-    {
-               m_ipos[0] = ipos[0]; 
-               m_ipos[1] = ipos[1]; 
+       KX_OrientationInterpolator(MT_Matrix3x3& target,
+                                  KX_IScalarInterpolator **ipos)
+           : m_target(target)
+       {
+               m_ipos[0] = ipos[0];
+               m_ipos[1] = ipos[1];
                m_ipos[2] = ipos[2];
        }
        
index c34a005..1eed066 100644 (file)
@@ -66,7 +66,7 @@ protected:
        btIDebugDraw*   m_debugDrawer;
        
        class btDefaultCollisionConfiguration* m_collisionConfiguration;
-    class btBroadphaseInterface*               m_broadphase;   // broadphase for dynamic world
+       class btBroadphaseInterface*            m_broadphase;   // broadphase for dynamic world
        // for culling only
        btOverlappingPairCache*                         m_cullingCache;
        struct btDbvtBroadphase*                        m_cullingTree;  // broadphase for culling
index 2988aa4..478aa0a 100644 (file)
@@ -207,7 +207,7 @@ public:
         * @return true if stereo mode is enabled.
         */
        virtual bool    Stereo()=0;
-    virtual StereoMode GetStereoMode()=0;
+       virtual StereoMode GetStereoMode()=0;
        virtual bool    InterlacedStereo()=0;
        /**
         * Sets which eye buffer subsequent primitives will be rendered to.
index 422d6df..baf3d9c 100644 (file)
@@ -39,7 +39,7 @@ void main(void)
 {
        vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st); 
        float gray = dot(texcolor.rgb, vec3(0.299, 0.587, 0.114));
-    gl_FragColor = vec4(gray, gray, gray, texcolor.a);
+       gl_FragColor = vec4(gray, gray, gray, texcolor.a);
 }
 );
 #endif
index 475f350..7df271c 100644 (file)
@@ -37,9 +37,9 @@ uniform sampler2D bgl_RenderedTexture;
 
 void main(void)
 {
-       vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st); 
+       vec4 texcolor = texture2D(bgl_RenderedTexture, gl_TexCoord[0].st);
        gl_FragColor.rgb = 1.0 - texcolor.rgb;
-    gl_FragColor.a = texcolor.a;
+       gl_FragColor.a = texcolor.a;
 }
 );
 #endif
index cbfa495..c28db2f 100644 (file)
@@ -149,7 +149,7 @@ public:
        virtual void    SetRenderArea();
 
        virtual void    SetStereoMode(const StereoMode stereomode);
-    virtual RAS_IRasterizer::StereoMode GetStereoMode();
+       virtual RAS_IRasterizer::StereoMode GetStereoMode();
        virtual bool    Stereo();
        virtual bool    InterlacedStereo();
        virtual void    SetEye(const StereoEye eye);
index 9e7e514..3fb4eb7 100644 (file)
@@ -245,10 +245,10 @@ public:
                }
        }
        virtual ~SG_DListHead() {}
-    T* Remove()
-    {
+       T* Remove()
+       {
                return static_cast<T*>(SG_DList::Remove());
-    }
+       }
 
 };
 
index 1101fbb..4dfd701 100644 (file)
@@ -52,42 +52,42 @@ public:
        virtual ~ImageRender (void);
 
        /// get background color
-    int getBackground (int idx) { return (idx < 0 || idx > 3) ? 0 : int(m_background[idx]*255.f); }
+       int getBackground (int idx) { return (idx < 0 || idx > 3) ? 0 : int(m_background[idx]*255.f); }
        /// set background color
        void setBackground (int red, int green, int blue, int alpha);
 
        /// clipping distance
        float getClip (void) { return m_clip; }
        /// set whole buffer use
-    void setClip (float clip) { m_clip = clip; }
+       void setClip (float clip) { m_clip = clip; }
 
 protected:
-    /// true if ready to render
-    bool m_render;
+       /// true if ready to render
+       bool m_render;
        /// rendered scene
        KX_Scene * m_scene;
        /// camera for render
        KX_Camera * m_camera;
-    /// do we own the camera?
-    bool m_owncamera;
-    /// for mirror operation
-    KX_GameObject * m_observer;
-    KX_GameObject * m_mirror;
+       /// do we own the camera?
+       bool m_owncamera;
+       /// for mirror operation
+       KX_GameObject * m_observer;
+       KX_GameObject * m_mirror;
        float m_clip;                                           // clipping distance
-    float m_mirrorHalfWidth;            // mirror width in mirror space
-    float m_mirrorHalfHeight;           // mirror height in mirror space
-    MT_Point3 m_mirrorPos;              // mirror center position in local space
-    MT_Vector3 m_mirrorZ;               // mirror Z axis in local space
-    MT_Vector3 m_mirrorY;               // mirror Y axis in local space
-    MT_Vector3 m_mirrorX;               // mirror X axis in local space
-    /// canvas
-    RAS_ICanvas* m_canvas;
-    /// rasterizer
-    RAS_IRasterizer* m_rasterizer;
-    /// render tools
-    RAS_IRenderTools* m_rendertools;
-    /// engine
-    KX_KetsjiEngine* m_engine;
+       float m_mirrorHalfWidth;            // mirror width in mirror space
+       float m_mirrorHalfHeight;           // mirror height in mirror space
+       MT_Point3 m_mirrorPos;              // mirror center position in local space
+       MT_Vector3 m_mirrorZ;               // mirror Z axis in local space
+       MT_Vector3 m_mirrorY;               // mirror Y axis in local space
+       MT_Vector3 m_mirrorX;               // mirror X axis in local space
+       /// canvas
+       RAS_ICanvas* m_canvas;
+       /// rasterizer
+       RAS_IRasterizer* m_rasterizer;
+       /// render tools
+       RAS_IRenderTools* m_rendertools;
+       /// engine
+       KX_KetsjiEngine* m_engine;
 
        /// background color
        float  m_background[4];
index 1b415fc..70c52b0 100644 (file)
@@ -51,7 +51,7 @@ public:
        /// is alpha channel used
        bool getAlpha (void) { return m_alpha; }
        /// set whole buffer use
-    void setAlpha (bool alpha) { m_alpha = alpha; }
+       void setAlpha (bool alpha) { m_alpha = alpha; }
 
        /// get capture size in viewport
        short * getCaptureSize (void) { return m_capSize; }
@@ -71,8 +71,8 @@ protected:
        short m_capSize[2];
        /// use whole viewport
        bool m_whole;
-    /// use alpha channel
-    bool m_alpha;
+       /// use alpha channel
+       bool m_alpha;
 
        /// position of capture rectangle in viewport
        GLint m_position[2];