Cleanup: style (pointers)
authorCampbell Barton <ideasman42@gmail.com>
Wed, 10 Oct 2018 21:49:28 +0000 (08:49 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 10 Oct 2018 22:03:39 +0000 (09:03 +1100)
38 files changed:
source/blender/alembic/intern/abc_exporter.cc
source/blender/alembic/intern/abc_exporter.h
source/blender/alembic/intern/abc_hair.cc
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/bmfont.c
source/blender/collada/AnimationImporter.h
source/blender/collada/ArmatureExporter.cpp
source/blender/collada/ArmatureImporter.cpp
source/blender/collada/ControllerExporter.cpp
source/blender/collada/GeometryExporter.cpp
source/blender/collada/GeometryExporter.h
source/blender/collada/collada_utils.cpp
source/blender/compositor/intern/COM_NodeOperation.cpp
source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
source/blender/editors/space_file/filelist.h
source/blender/freestyle/intern/application/AppCanvas.h
source/blender/freestyle/intern/application/AppConfig.h
source/blender/freestyle/intern/application/Controller.cpp
source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
source/blender/freestyle/intern/geometry/Grid.h
source/blender/freestyle/intern/geometry/SweepLine.h
source/blender/freestyle/intern/image/ImagePyramid.cpp
source/blender/freestyle/intern/python/BPy_Convert.h
source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
source/blender/freestyle/intern/python/BPy_Interface1D.cpp
source/blender/freestyle/intern/python/BPy_SShape.cpp
source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
source/blender/freestyle/intern/scene_graph/NodeCamera.h
source/blender/freestyle/intern/view_map/Interface0D.cpp
source/blender/imbuf/intern/dds/BlockDXT.cpp
source/blender/imbuf/intern/dds/ColorBlock.h
source/blender/imbuf/intern/dds/Image.cpp
source/blender/imbuf/intern/dds/Image.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_access.c
source/blender/python/generic/py_capi_utils.h
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c

index 6c1eeb9..9ffed42 100644 (file)
@@ -415,7 +415,7 @@ void AbcExporter::exploreTransform(EvaluationContext *eval_ctx, Object *ob, Obje
        }
 }
 
-AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent)
+AbcTransformWriter *AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent)
 {
        /* An object should not be its own parent, or we'll get infinite loops. */
        BLI_assert(ob != parent);
index 280682b..ae30b45 100644 (file)
@@ -114,7 +114,7 @@ private:
        Alembic::Abc::TimeSamplingPtr createTimeSampling(double step);
 
        void createTransformWritersHierarchy(EvaluationContext *eval_ctx);
-       AbcTransformWriter * createTransformWriter(Object *ob,  Object *parent, Object *dupliObParent);
+       AbcTransformWriter *createTransformWriter(Object *ob,  Object *parent, Object *dupliObParent);
        void exploreTransform(EvaluationContext *eval_ctx, Object *ob, Object *parent, Object *dupliObParent = NULL);
        void exploreObject(EvaluationContext *eval_ctx, Object *ob, Object *dupliObParent);
        void createShapeWriters(EvaluationContext *eval_ctx);
index 0208da8..ed70d36 100644 (file)
@@ -139,7 +139,7 @@ void AbcHairWriter::write_hair_sample(DerivedMesh *dm,
                m_uv_warning_shown = true;
        }
 
-       ParticleData * pa = m_psys->particles;
+       ParticleData *pa = m_psys->particles;
        int k;
 
        ParticleCacheKey **cache = m_psys->pathcache;
index ddbf402..54c927a 100644 (file)
@@ -65,7 +65,7 @@ struct EdgeHash;
 
 #define PARTICLE_COLLISION_MAX_COLLISIONS 10
 
-#define PARTICLE_P              ParticleData * pa; int p
+#define PARTICLE_P              ParticleData *pa; int p
 #define LOOP_PARTICLES  for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++)
 #define LOOP_EXISTING_PARTICLES for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) if (!(pa->flag & PARS_UNEXIST))
 #define LOOP_SHOWN_PARTICLES for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) if (!(pa->flag & (PARS_UNEXIST | PARS_NO_DISP)))
@@ -73,7 +73,7 @@ struct EdgeHash;
 #define LOOP_DYNAMIC_PARTICLES for (p = 0; p < psys->totpart; p++) if ((pa = psys->particles + p)->state.time > 0.0f)
 
 /* fast but sure way to get the modifier*/
-#define PARTICLE_PSMD ParticleSystemModifierData * psmd = sim->psmd ? sim->psmd : psys_get_modifier(sim->ob, sim->psys)
+#define PARTICLE_PSMD ParticleSystemModifierData *psmd = sim->psmd ? sim->psmd : psys_get_modifier(sim->ob, sim->psys)
 
 /* common stuff that many particle functions need */
 typedef struct ParticleSimulationData {
index c99894b..b33b07e 100644 (file)
@@ -85,7 +85,7 @@ void readBitmapFontVersion0(ImBuf *ibuf, unsigned char *rect, int step)
 {
        int glyphcount, bytes, i, index, linelength, ysize;
        unsigned char *buffer;
-       bmFont * bmfont;
+       bmFont *bmfont;
 
        linelength = ibuf->x * step;
 
index f633291..ff49bc3 100644 (file)
@@ -181,11 +181,12 @@ public:
        // prerequisites:
        // animlist_map - map animlist id -> animlist
        // curve_map - map anim id -> curve(s)
-       Object * translate_animation_OLD(Main *bmain, COLLADAFW::Node *node,
-                                        std::map<COLLADAFW::UniqueId, Object*>& object_map,
-                                        std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
-                                        COLLADAFW::Transformation::TransformationType tm_type,
-                                        Object *par_job = NULL);
+       Object *translate_animation_OLD(
+               Main *bmain, COLLADAFW::Node *node,
+               std::map<COLLADAFW::UniqueId, Object*>& object_map,
+               std::map<COLLADAFW::UniqueId, COLLADAFW::Node*>& root_map,
+               COLLADAFW::Transformation::TransformationType tm_type,
+               Object *par_job = NULL);
 
        void find_frames( std::vector<float>* frames, std::vector<FCurve*>* curves );
        void find_frames_old( std::vector<float>* frames, COLLADAFW::Node * node, COLLADAFW::Transformation::TransformationType tm_type );
index 52f7c56..432ce92 100644 (file)
@@ -69,7 +69,7 @@ void ArmatureExporter::add_armature_bones(bContext *C, Object *ob_arm, Scene *sc
        Main *bmain = CTX_data_main(C);
        // write bone nodes
 
-       bArmature * armature = (bArmature *)ob_arm->data;
+       bArmature *armature = (bArmature *)ob_arm->data;
        bool is_edited = armature->edbo != NULL;
 
        if (!is_edited)
index e8b665b..a96d1e7 100644 (file)
@@ -460,11 +460,11 @@ void ArmatureImporter::create_armature_bones(Main *bmain, std::vector<Object *>
                if (!ob_arm)
                        continue;
 
-               bArmature * armature = (bArmature *)ob_arm->data;
+               bArmature *armature = (bArmature *)ob_arm->data;
                if (!armature)
                        continue;
 
-               char * bone_name = (char *)bc_get_joint_name(*ri);
+               char *bone_name = (char *)bc_get_joint_name(*ri);
                Bone *bone = BKE_armature_find_bone_name(armature, bone_name);
                if (bone) {
                        fprintf(stderr, "Reuse of child bone [%s] as root bone in same Armature is not supported.\n", bone_name);
@@ -589,7 +589,7 @@ Object *ArmatureImporter::create_armature_bones(Main *bmain, SkinInfo& skin)
        }
 
        // enter armature edit mode
-       bArmature * armature = (bArmature *)ob_arm->data;
+       bArmature *armature = (bArmature *)ob_arm->data;
        ED_armature_to_edit(armature);
 
        totbone = 0;
index fa3f026..a5f9612 100644 (file)
@@ -404,7 +404,7 @@ void ControllerExporter::add_weight_extras(Key *key)
        // can also try the base element and param alternative
        COLLADASW::BaseExtraTechnique extra;
 
-       KeyBlock * kb = (KeyBlock *)key->block.first;
+       KeyBlock *kb = (KeyBlock *)key->block.first;
        //skip the basis
        kb = kb->next;
        for (; kb; kb = kb->next) {
index 5f310c2..eb627b5 100644 (file)
@@ -166,9 +166,9 @@ void GeometryExporter::operator()(Object *ob)
        closeGeometry();
 
        if (this->export_settings->include_shapekeys) {
-               Key * key = BKE_key_from_object(ob);
+               Key *key = BKE_key_from_object(ob);
                if (key) {
-                       KeyBlock * kb = (KeyBlock *)key->block.first;
+                       KeyBlock *kb = (KeyBlock *)key->block.first;
                        //skip the basis
                        kb = kb->next;
                        for (; kb; kb = kb->next) {
index dea97fc..fd9db7b 100644 (file)
@@ -143,7 +143,7 @@ private:
 
        const ExportSettings *export_settings;
 
-       Mesh * get_mesh(Scene *sce, Object *ob, int apply_modifiers);
+       Mesh *get_mesh(Scene *sce, Object *ob, int apply_modifiers);
 };
 
 struct GeometryFunctor {
index ec45a6d..b25a35a 100644 (file)
@@ -603,7 +603,7 @@ inline bool isInteger(const std::string & s)
 {
        if (s.empty() || ((!isdigit(s[0])) && (s[0] != '-') && (s[0] != '+'))) return false;
 
-       char * p;
+       char *p;
        strtol(s.c_str(), &p, 10);
 
        return (*p == 0);
index 1063386..09b0531 100644 (file)
@@ -171,7 +171,7 @@ bool NodeOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOper
                rcti tempOutput;
                bool first = true;
                for (int i = 0; i < getNumberOfInputSockets(); i ++) {
-                       NodeOperation * inputOperation = this->getInputOperation(i);
+                       NodeOperation *inputOperation = this->getInputOperation(i);
                        if (inputOperation && inputOperation->determineDependingAreaOfInterest(input, readOperation, &tempOutput)) {
                                if (first) {
                                        output->xmin = tempOutput.xmin;
index a252af0..b400514 100644 (file)
@@ -288,7 +288,7 @@ void InverseSearchRadiusOperation::initExecution()
 
 void *InverseSearchRadiusOperation::initializeTileData(rcti *rect)
 {
-       MemoryBuffer * data = new MemoryBuffer(COM_DT_COLOR, rect);
+       MemoryBuffer *data = new MemoryBuffer(COM_DT_COLOR, rect);
        float *buffer = data->getBuffer();
        int x, y;
        int width = this->m_inputRadius->getWidth();
index 76845c4..6d898ee 100644 (file)
@@ -56,12 +56,12 @@ typedef enum FileCheckType {
        CHECK_ALL = 3
 } FileCheckType;
 
-struct ListBase *   folderlist_new(void);
+struct ListBase    *folderlist_new(void);
 void                folderlist_free(struct ListBase *folderlist);
-struct ListBase *   folderlist_duplicate(ListBase *folderlist);
+struct ListBase    *folderlist_duplicate(ListBase *folderlist);
 void                folderlist_popdir(struct ListBase *folderlist, char *dir);
 void                folderlist_pushdir(struct ListBase *folderlist, const char *dir);
-const char *        folderlist_peeklastdir(struct ListBase *folderdist);
+const char         *folderlist_peeklastdir(struct ListBase *folderdist);
 int                 folderlist_clear_next(struct SpaceFile *sfile);
 
 
@@ -77,24 +77,24 @@ void                filelist_filter(struct FileList *filelist);
 void                filelist_init_icons(void);
 void                filelist_free_icons(void);
 void                filelist_imgsize(struct FileList *filelist, short w, short h);
-struct ImBuf *      filelist_getimage(struct FileList *filelist, const int index);
-struct ImBuf *      filelist_geticon_image(struct FileList *filelist, const int index);
+struct ImBuf       *filelist_getimage(struct FileList *filelist, const int index);
+struct ImBuf       *filelist_geticon_image(struct FileList *filelist, const int index);
 int                 filelist_geticon(struct FileList *filelist, const int index, const bool is_main);
 
-struct FileList *   filelist_new(short type);
+struct FileList    *filelist_new(short type);
 void                filelist_clear(struct FileList *filelist);
 void                filelist_clear_ex(struct FileList *filelist, const bool do_cache, const bool do_selection);
 void                filelist_free(struct FileList *filelist);
 
-const char *        filelist_dir(struct FileList *filelist);
+const char         *filelist_dir(struct FileList *filelist);
 bool                filelist_is_dir(struct FileList *filelist, const char *path);
 void                filelist_setdir(struct FileList *filelist, char *r_dir);
 
 int                 filelist_files_ensure(struct FileList *filelist);
 int                 filelist_empty(struct FileList *filelist);
-FileDirEntry *      filelist_file(struct FileList *filelist, int index);
+FileDirEntry       *filelist_file(struct FileList *filelist, int index);
 int                 filelist_file_findpath(struct FileList *filelist, const char *file);
-FileDirEntry *      filelist_entry_find_uuid(struct FileList *filelist, const int uuid[4]);
+FileDirEntry       *filelist_entry_find_uuid(struct FileList *filelist, const int uuid[4]);
 void                filelist_file_cache_slidingwindow_set(struct FileList *filelist, size_t window_size);
 bool                filelist_file_cache_block(struct FileList *filelist, const int index);
 
index 9a92cf4..ed473e2 100644 (file)
@@ -69,7 +69,7 @@ public:
        virtual float thickness() const;
 
        AppView *_pViewer;
-       inline const AppView * viewer() const {return _pViewer;}
+       inline const AppView *viewer() const {return _pViewer;}
 
        /*! modifiers */
        void setViewer(AppView *iViewer);
index ae1d96e..d7572aa 100644 (file)
@@ -44,7 +44,7 @@ namespace Config {
 
 class Path {
 protected:
-       static Path * _pInstance;
+       static Path *_pInstance;
        string _ProjectDir;
        string _ModelsPath;
        string _PatternsPath;
index 46db99a..03dc5f6 100644 (file)
@@ -642,11 +642,11 @@ void Controller::ComputeSteerableViewMap()
        NodeShape *completeNS = new NodeShape;
        completeNS->material().setDiffuse(c,c,c,1);
        ng[Canvas::NB_STEERABLE_VIEWMAP-1]->AddChild(completeNS);
-       SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+       SteerableViewMap *svm = _Canvas->getSteerableViewMap();
        svm->Reset();
 
        ViewMap::fedges_container& fedges = _ViewMap->FEdges();
-       LineRep * fRep;
+       LineRep *fRep;
        NodeShape *ns;
        for (ViewMap::fedges_container::iterator f = fedges.begin(), fend = fedges.end();
             f != fend;
@@ -722,7 +722,7 @@ void Controller::ComputeSteerableViewMap()
 
 void Controller::saveSteerableViewMapImages()
 {
-       SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+       SteerableViewMap *svm = _Canvas->getSteerableViewMap();
        if (!svm) {
                cerr << "the Steerable ViewMap has not been computed yet" << endl;
                return;
@@ -1003,7 +1003,7 @@ void Controller::resetModified(bool iMod)
        _Canvas->resetModified(iMod);
 }
 
-NodeGroup * Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin, vector<ViewEdge*>::iterator vedges_end)
+NodeGroup *Controller::BuildRep(vector<ViewEdge*>::iterator vedges_begin, vector<ViewEdge*>::iterator vedges_end)
 {
        ViewMapTesselator2D tesselator2D;
        FrsMaterial mat;
@@ -1052,7 +1052,7 @@ void Controller::resetInterpreter()
 
 void Controller::displayDensityCurves(int x, int y)
 {
-       SteerableViewMap * svm = _Canvas->getSteerableViewMap();
+       SteerableViewMap *svm = _Canvas->getSteerableViewMap();
        if (!svm)
                return;
 
index 894f8ee..2907019 100644 (file)
@@ -82,7 +82,7 @@ public:
        virtual ~BlenderFileLoader();
 
        /*! Loads the 3D scene and returns a pointer to the scene root node */
-       NodeGroup * Load();
+       NodeGroup *Load();
 
        /*! Gets the number of read faces */
        inline unsigned int numFacesRead() {return _numFacesRead;}
index 7d025a6..0a9be01 100644 (file)
@@ -290,8 +290,9 @@ public:
         *  Returns the first intersection (occluder,t,u,v) or null.
         *  Starts with a call to InitRay.
         */
-       Polygon3r * castRayToFindFirstIntersection(const Vec3r& orig, const Vec3r& dir, double& t,
-                                                  double& u, double& v, unsigned timestamp);
+       Polygon3r *castRayToFindFirstIntersection(
+               const Vec3r& orig, const Vec3r& dir, double& t,
+               double& u, double& v, unsigned timestamp);
 
 
        /*! Init all structures and values for computing the cells intersected by this new ray */
index 98e8608..3edd045 100644 (file)
@@ -72,7 +72,7 @@ public:
        }
 
 public:
-       void * userdata; // FIXME
+       void *userdata; // FIXME
 
        Edge *EdgeA; // first segment
        Edge *EdgeB; // second segment
index b81f830..db92cc6 100644 (file)
@@ -61,7 +61,7 @@ ImagePyramid::~ImagePyramid()
        }
 }
 
-GrayImage * ImagePyramid::getLevel(int l)
+GrayImage *ImagePyramid::getLevel(int l)
 {
        return _levels[l];
 }
index a0e0b57..976b760 100644 (file)
@@ -98,53 +98,53 @@ extern "C" {
 // C++ => Python
 //==============================
 
-PyObject * PyBool_from_bool(bool b);
-PyObject * Vector_from_Vec2f(Vec2f& v);
-PyObject * Vector_from_Vec3f(Vec3f& v);
-PyObject * Vector_from_Vec3r(Vec3r& v);
-
-PyObject * Any_BPy_Interface0D_from_Interface0D(Interface0D& if0D);
-PyObject * Any_BPy_Interface1D_from_Interface1D(Interface1D& if1D);
-PyObject * Any_BPy_FEdge_from_FEdge(FEdge& fe);
-PyObject * Any_BPy_ViewVertex_from_ViewVertex(ViewVertex& vv);
-
-PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb);
-PyObject * BPy_CurvePoint_from_CurvePoint(CurvePoint& cp);
-PyObject * BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge& dve);
-PyObject * BPy_FEdge_from_FEdge(FEdge& fe);
-PyObject * BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes);
-PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes);
-PyObject * BPy_Id_from_Id(Id& id);
-PyObject * BPy_Interface0D_from_Interface0D(Interface0D& if0D);
-PyObject * BPy_Interface1D_from_Interface1D(Interface1D& if1D);
-PyObject * BPy_IntegrationType_from_IntegrationType(IntegrationType i);
-PyObject * BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m);
-PyObject * BPy_Nature_from_Nature(unsigned short n);
-PyObject * BPy_MediumType_from_MediumType(Stroke::MediumType n);
-PyObject * BPy_SShape_from_SShape(SShape& ss);
-PyObject * BPy_Stroke_from_Stroke(Stroke& s);
-PyObject * BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa);
-PyObject * BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv);
-PyObject * BPy_SVertex_from_SVertex(SVertex& sv);
-PyObject * BPy_ViewVertex_from_ViewVertex(ViewVertex& vv);
-PyObject * BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv);
-PyObject * BPy_TVertex_from_TVertex(TVertex& tv);
-PyObject * BPy_ViewEdge_from_ViewEdge(ViewEdge& ve);
-PyObject * BPy_Chain_from_Chain(Chain& c);
-PyObject * BPy_ViewShape_from_ViewShape(ViewShape& vs);
-
-PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it);
-PyObject * BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, bool reversed);
-PyObject * BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it);
-PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it,
+PyObject *PyBool_from_bool(bool b);
+PyObject *Vector_from_Vec2f(Vec2f& v);
+PyObject *Vector_from_Vec3f(Vec3f& v);
+PyObject *Vector_from_Vec3r(Vec3r& v);
+
+PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D& if0D);
+PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D& if1D);
+PyObject *Any_BPy_FEdge_from_FEdge(FEdge& fe);
+PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex& vv);
+
+PyObject *BPy_BBox_from_BBox(const BBox< Vec3r > &bb);
+PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint& cp);
+PyObject *BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge& dve);
+PyObject *BPy_FEdge_from_FEdge(FEdge& fe);
+PyObject *BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes);
+PyObject *BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes);
+PyObject *BPy_Id_from_Id(Id& id);
+PyObject *BPy_Interface0D_from_Interface0D(Interface0D& if0D);
+PyObject *BPy_Interface1D_from_Interface1D(Interface1D& if1D);
+PyObject *BPy_IntegrationType_from_IntegrationType(IntegrationType i);
+PyObject *BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m);
+PyObject *BPy_Nature_from_Nature(unsigned short n);
+PyObject *BPy_MediumType_from_MediumType(Stroke::MediumType n);
+PyObject *BPy_SShape_from_SShape(SShape& ss);
+PyObject *BPy_Stroke_from_Stroke(Stroke& s);
+PyObject *BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa);
+PyObject *BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv);
+PyObject *BPy_SVertex_from_SVertex(SVertex& sv);
+PyObject *BPy_ViewVertex_from_ViewVertex(ViewVertex& vv);
+PyObject *BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv);
+PyObject *BPy_TVertex_from_TVertex(TVertex& tv);
+PyObject *BPy_ViewEdge_from_ViewEdge(ViewEdge& ve);
+PyObject *BPy_Chain_from_Chain(Chain& c);
+PyObject *BPy_ViewShape_from_ViewShape(ViewShape& vs);
+
+PyObject *BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it);
+PyObject *BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, bool reversed);
+PyObject *BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it);
+PyObject *BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it,
                                                               bool reversed);
-PyObject * BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it);
-PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it,
+PyObject *BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it);
+PyObject *BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it,
                                                                       bool reversed);
-PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it);
-PyObject * BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it);
-PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it);
-PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator& cs_it);
+PyObject *BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it);
+PyObject *BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it);
+PyObject *BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it);
+PyObject *BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator& cs_it);
 
 //==============================
 // Python => C++
index 548ab52..a6683f5 100644 (file)
@@ -63,7 +63,7 @@ PyDoc_STRVAR(Integrator_integrate_doc,
 "      :class:`UnaryFunction0DUnsigned` type.\n"
 "   :rtype: int or float");
 
-static PyObject * Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObject *kwds)
+static PyObject *Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"func", "it", "it_end", "integration_type", NULL};
        PyObject *obj1, *obj4 = 0;
index 0fc3ec4..c5a07fd 100644 (file)
@@ -138,7 +138,7 @@ PyDoc_STRVAR(Interface1D_vertices_begin_doc,
 "   :return: An Interface0DIterator pointing to the first vertex.\n"
 "   :rtype: :class:`Interface0DIterator`");
 
-static PyObject * Interface1D_vertices_begin(BPy_Interface1D *self)
+static PyObject *Interface1D_vertices_begin(BPy_Interface1D *self)
 {
        Interface0DIterator if0D_it(self->if1D->verticesBegin());
        return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, false);
@@ -153,7 +153,7 @@ PyDoc_STRVAR(Interface1D_vertices_end_doc,
 "   :return: An Interface0DIterator pointing after the last vertex.\n"
 "   :rtype: :class:`Interface0DIterator`");
 
-static PyObject * Interface1D_vertices_end(BPy_Interface1D *self)
+static PyObject *Interface1D_vertices_end(BPy_Interface1D *self)
 {
        Interface0DIterator if0D_it(self->if1D->verticesEnd());
        return BPy_Interface0DIterator_from_Interface0DIterator(if0D_it, true);
@@ -173,7 +173,7 @@ PyDoc_STRVAR(Interface1D_points_begin_doc,
 "   :return: An Interface0DIterator pointing to the first point.\n"
 "   :rtype: :class:`Interface0DIterator`");
 
-static PyObject * Interface1D_points_begin(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
+static PyObject *Interface1D_points_begin(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"t", NULL};
        float f = 0.0f;
@@ -198,7 +198,7 @@ PyDoc_STRVAR(Interface1D_points_end_doc,
 "   :return: An Interface0DIterator pointing after the last point.\n"
 "   :rtype: :class:`Interface0DIterator`");
 
-static PyObject * Interface1D_points_end(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
+static PyObject *Interface1D_points_end(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"t", NULL};
        float f = 0.0f;
index cf4880a..28c9e81 100644 (file)
@@ -122,7 +122,7 @@ PyDoc_STRVAR(SShape_add_vertex_doc,
 "   :arg vertex: An SVertex object.\n"
 "   :type vertex: :class:`SVertex`");
 
-static PyObject * SShape_add_vertex(BPy_SShape *self, PyObject *args, PyObject *kwds)
+static PyObject *SShape_add_vertex(BPy_SShape *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"edge", NULL};
        PyObject *py_sv = 0;
index fb7eb49..b390bb2 100644 (file)
@@ -135,7 +135,7 @@ static void StrokeAttribute_dealloc(BPy_StrokeAttribute *self)
        Py_TYPE(self)->tp_free((PyObject *)self);
 }
 
-static PyObject * StrokeAttribute_repr(BPy_StrokeAttribute *self)
+static PyObject *StrokeAttribute_repr(BPy_StrokeAttribute *self)
 {
        stringstream repr("StrokeAttribute:");
        repr << " r: " << self->sa->getColorR() << " g: " << self->sa->getColorG() << " b: " << self->sa->getColorB() <<
@@ -282,7 +282,7 @@ PyDoc_STRVAR(StrokeAttribute_set_attribute_real_doc,
 "   :arg value: The attribute value.\n"
 "   :type value: float\n");
 
-static PyObject * StrokeAttribute_set_attribute_real(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
+static PyObject *StrokeAttribute_set_attribute_real(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"name", "value", NULL};
        char *s = 0;
@@ -306,7 +306,7 @@ PyDoc_STRVAR(StrokeAttribute_set_attribute_vec2_doc,
 "   :arg value: The attribute value.\n"
 "   :type value: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n");
 
-static PyObject * StrokeAttribute_set_attribute_vec2(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
+static PyObject *StrokeAttribute_set_attribute_vec2(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"name", "value", NULL};
        char *s;
@@ -335,7 +335,7 @@ PyDoc_STRVAR(StrokeAttribute_set_attribute_vec3_doc,
 "   :arg value: The attribute value.\n"
 "   :type value: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n");
 
-static PyObject * StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
+static PyObject *StrokeAttribute_set_attribute_vec3(BPy_StrokeAttribute *self, PyObject *args, PyObject *kwds)
 {
        static const char *kwlist[] = {"name", "value", NULL};
        char *s;
index c2f70d5..2fc6a00 100644 (file)
@@ -68,12 +68,12 @@ public:
        /*! Matrix is copied */
        void setProjectionMatrix(double projection_matrix[16]);
 
-       double * modelViewMatrix()
+       double *modelViewMatrix()
        {
                return modelview_matrix_;
        }
 
-       double * projectionMatrix()
+       double *projectionMatrix()
        {
                return projection_matrix_;
        }
index 1d85157..5cfd216 100644 (file)
@@ -78,7 +78,7 @@ Geometry::Vec2r Interface0D::getPoint2D() const
        return 0;
 }
 
-FEdge * Interface0D::getFEdge(Interface0D&)
+FEdge *Interface0D::getFEdge(Interface0D&)
 {
        PyErr_SetString(PyExc_TypeError, "method getFEdge() not properly overridden");
        return 0;
@@ -96,25 +96,25 @@ Nature::VertexNature Interface0D::getNature() const
        return Nature::POINT;
 }
 
-SVertex * Interface0D::castToSVertex()
+SVertex *Interface0D::castToSVertex()
 {
        PyErr_SetString(PyExc_TypeError, "method castToSVertex() not properly overridden");
        return 0;
 }
 
-ViewVertex * Interface0D::castToViewVertex()
+ViewVertex *Interface0D::castToViewVertex()
 {
        PyErr_SetString(PyExc_TypeError, "method castToViewVertex() not properly overridden");
        return 0;
 }
 
-NonTVertex * Interface0D::castToNonTVertex()
+NonTVertex *Interface0D::castToNonTVertex()
 {
        PyErr_SetString(PyExc_TypeError, "method castToNonTVertex() not properly overridden");
        return 0;
 }
 
-TVertex * Interface0D::castToTVertex()
+TVertex *Interface0D::castToTVertex()
 {
        PyErr_SetString(PyExc_TypeError, "method castToTVertex() not properly overridden");
        return 0;
index 7273ec1..0887576 100644 (file)
@@ -430,7 +430,7 @@ void AlphaBlockDXT5::decodeBlock(ColorBlock *block) const
 
 void AlphaBlockDXT5::flip4()
 {
-       uint64 * b = (uint64 *)this;
+       uint64 *b = (uint64 *)this;
 
        // @@ The masks might have to be byte swapped.
        uint64 tmp = (*b & (uint64)(0x000000000000FFFFLL));
@@ -444,7 +444,7 @@ void AlphaBlockDXT5::flip4()
 
 void AlphaBlockDXT5::flip2()
 {
-       uint * b = (uint *)this;
+       uint *b = (uint *)this;
 
        // @@ The masks might have to be byte swapped.
        uint tmp = (*b & 0xFF000000);
index 7b5291c..67c0b64 100644 (file)
@@ -45,9 +45,9 @@ struct ColorBlock {
        ColorBlock();
        ColorBlock(const uint * linearImage);
        ColorBlock(const ColorBlock & block);
-       ColorBlock(const Image * img, uint x, uint y);
+       ColorBlock(const Image *img, uint x, uint y);
 
-       void init(const Image * img, uint x, uint y);
+       void init(const Image *img, uint x, uint y);
        void init(uint w, uint h, const uint * data, uint x, uint y);
        void init(uint w, uint h, const float * data, uint x, uint y);
 
index fd3ca1c..2e9ae9d 100644 (file)
@@ -82,7 +82,7 @@ const Color32 * Image::scanline(uint h) const
        return m_data + h * m_width;
 }
 
-Color32 * Image::scanline(uint h)
+Color32 *Image::scanline(uint h)
 {
        if (h >= m_height) {
                printf("DDS: scanline beyond dimensions of image\n");
@@ -91,12 +91,12 @@ Color32 * Image::scanline(uint h)
        return m_data + h * m_width;
 }
 
-const Color32 * Image::pixels() const
+const Color32 *Image::pixels() const
 {
        return m_data;
 }
 
-Color32 * Image::pixels()
+Color32 *Image::pixels()
 {
        return m_data;
 }
index bb74a9d..9a8bacd 100644 (file)
@@ -65,11 +65,11 @@ public:
        uint width() const;
        uint height() const;
 
-       const Color32 * scanline(uint h) const;
-       Color32 * scanline(uint h);
+       const Color32 *scanline(uint h) const;
+       Color32 *scanline(uint h);
 
-       const Color32 * pixels() const;
-       Color32 * pixels();
+       const Color32 *pixels() const;
+       Color32 *pixels();
 
        const Color32 & pixel(uint idx) const;
        Color32 & pixel(uint idx);
@@ -87,7 +87,7 @@ private:
        uint m_width;
        uint m_height;
        Format m_format;
-       Color32 * m_data;
+       Color32 *m_data;
 };
 
 
index 6335869..bebf232 100644 (file)
@@ -376,7 +376,7 @@ static struct ID *rna_ID_make_local(struct ID *self, Main *bmain, bool clear_pro
 }
 
 
-static AnimData * rna_ID_animation_data_create(ID *id, Main *bmain)
+static AnimData *rna_ID_animation_data_create(ID *id, Main *bmain)
 {
        AnimData *adt = BKE_animdata_add_id(id);
        DAG_relations_tag_update(bmain);
index d805d61..5129334 100644 (file)
@@ -6872,7 +6872,7 @@ int RNA_function_call_direct_va(bContext *C, ReportList *reports, PointerRNA *pt
                                case PROP_COLLECTION:
                                {
                                        StructRNA *srna = va_arg(args, StructRNA *);
-                                       ListBase **arg = va_arg(args, ListBase * *);
+                                       ListBase **arg = va_arg(args, ListBase **);
                                        err = rna_function_parameter_parse(&funcptr, parm, type, ftype, len, arg, retdata,
                                                                           srna, tid, fid, pid);
                                        break;
index 92964fc..4cf6d6b 100644 (file)
 #include "BLI_sys_types.h"
 #include "BLI_utildefines_variadic.h"
 
-void                   PyC_ObSpit(const char *name, PyObject *var);
-void                   PyC_ObSpitStr(char *result, size_t result_len, PyObject *var);
-void                   PyC_LineSpit(void);
-void                   PyC_StackSpit(void);
-PyObject *             PyC_ExceptionBuffer(void);
-PyObject *             PyC_ExceptionBuffer_Simple(void);
-PyObject *             PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...);
-PyObject *             PyC_FrozenSetFromStrings(const char **strings);
-PyObject *             PyC_Err_Format_Prefix(PyObject *exception_type_prefix, const char *format, ...);
-void                   PyC_Err_PrintWithFunc(PyObject *py_func);
-
-void                   PyC_FileAndNum(const char **filename, int *lineno);
-void                   PyC_FileAndNum_Safe(const char **filename, int *lineno); /* checks python is running */
+void      PyC_ObSpit(const char *name, PyObject *var);
+void      PyC_ObSpitStr(char *result, size_t result_len, PyObject *var);
+void      PyC_LineSpit(void);
+void      PyC_StackSpit(void);
+PyObject *PyC_ExceptionBuffer(void);
+PyObject *PyC_ExceptionBuffer_Simple(void);
+PyObject *PyC_Object_GetAttrStringArgs(PyObject *o, Py_ssize_t n, ...);
+PyObject *PyC_FrozenSetFromStrings(const char **strings);
+PyObject *PyC_Err_Format_Prefix(PyObject *exception_type_prefix, const char *format, ...);
+void      PyC_Err_PrintWithFunc(PyObject *py_func);
+
+void   PyC_FileAndNum(const char **filename, int *lineno);
+void   PyC_FileAndNum_Safe(const char **filename, int *lineno); /* checks python is running */
 int             PyC_AsArray_FAST(
         void *array, PyObject *value_fast, const Py_ssize_t length,
         const PyTypeObject *type, const bool is_double, const char *error_prefix);
@@ -71,10 +71,10 @@ void            PyC_Tuple_Fill(PyObject *tuple, PyObject *value);
 void            PyC_List_Fill(PyObject *list, PyObject *value);
 
 /* follow http://www.python.org/dev/peps/pep-0383/ */
-PyObject *      PyC_UnicodeFromByte(const char *str);
-PyObject *      PyC_UnicodeFromByteAndSize(const char *str, Py_ssize_t size);
-const char *    PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce); /* coerce must be NULL */
-const char *    PyC_UnicodeAsByteAndSize(PyObject *py_str, Py_ssize_t *size, PyObject **coerce);
+PyObject   *PyC_UnicodeFromByte(const char *str);
+PyObject   *PyC_UnicodeFromByteAndSize(const char *str, Py_ssize_t size);
+const char *PyC_UnicodeAsByte(PyObject *py_str, PyObject **coerce); /* coerce must be NULL */
+const char *PyC_UnicodeAsByteAndSize(PyObject *py_str, Py_ssize_t *size, PyObject **coerce);
 
 /* name namespace function for bpy & bge */
 PyObject *PyC_DefaultNameSpace(const char *filename);
index 6e3dffc..608275c 100644 (file)
@@ -88,7 +88,7 @@ static void RE_rayobject_config_control(RayObject *r, Render *re)
 
 RayObject *RE_rayobject_create(int type, int size, int octree_resolution)
 {
-       RayObject * res = NULL;
+       RayObject *res = NULL;
 
        if (type == R_RAYSTRUCTURE_AUTO) {
                /* TODO */
@@ -124,7 +124,7 @@ RayObject *RE_rayobject_create(int type, int size, int octree_resolution)
 
 static RayObject* rayobject_create(Render *re, int type, int size)
 {
-       RayObject * res = NULL;
+       RayObject *res = NULL;
 
        res = RE_rayobject_create(type, size, re->r.ocres);
 
index 99d2436..cfbf199 100644 (file)
@@ -314,7 +314,7 @@ static void halo_tile(RenderPart *pa, RenderLayer *rl)
                                                                if ((zz> har->zs) || (har->mat && (har->mat->mode & MA_HALO_SOFT))) {
                                                                        if (shadeHaloFloat(har, col, zz, dist, xn, yn, har->flarec)) {
                                                                                for (sample=0; sample<totsample; sample++) {
-                                                                                       float * rect= RE_RenderLayerGetPass(rlpp[sample], RE_PASSNAME_COMBINED, R.viewname);
+                                                                                       float *rect = RE_RenderLayerGetPass(rlpp[sample], RE_PASSNAME_COMBINED, R.viewname);
                                                                                        addalphaAddfacFloat(rect + od*4, col, har->add);
                                                                                }
                                                                        }