diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-04-22 15:54:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-22 15:54:53 +0400 |
commit | 5c891386842037910f5d522c7d3ffb1792b804db (patch) | |
tree | 133e551d3bf684ea1ccaa8a7d56a4f57b879a95a /source/blender/blenkernel | |
parent | 69d0a68f0d7ed82b9701c5a7832f609e4ea4fd75 (diff) |
style cleanup: comments
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/implicit.c | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 10 |
14 files changed, 46 insertions, 43 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 2d0719a78fa..742e6ef0b89 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -112,7 +112,7 @@ int poly_get_adj_loops_from_vert(unsigned adj_r[3], const struct MPoly *poly, const struct MLoop *mloop, unsigned vert); /* update the hide flag for edges and polys from the corresponding - flag in verts */ + * flag in verts */ void mesh_flush_hidden_from_verts(const struct MVert *mvert, const struct MLoop *mloop, struct MEdge *medge, int totedge, diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 7f9881926a6..8179c688580 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -68,7 +68,7 @@ void subsurf_calculate_limit_positions(struct Mesh *me, float (*positions_r)[3]) int ccg_gridsize(int level); /* x/y grid coordinates at 'low_level' can be multiplied by the result - of this function to convert to grid coordinates at 'high_level' */ + * of this function to convert to grid coordinates at 'high_level' */ int ccg_factor(int low_level, int high_level); void subsurf_copy_grid_hidden(struct DerivedMesh *dm, @@ -78,7 +78,7 @@ void subsurf_copy_grid_hidden(struct DerivedMesh *dm, typedef enum MultiresModifiedFlags { /* indicates the grids have been sculpted on, so MDisps - have to be updated */ + * have to be updated */ MULTIRES_COORDS_MODIFIED = 1, /* indicates elements have been hidden or unhidden */ MULTIRES_HIDDEN_MODIFIED = 2 diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 294518458bf..c28958d5b0d 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -2137,7 +2137,7 @@ static void mesh_build_data(Scene *scene, Object *ob, CustomDataMask dataMask, if ((ob->mode & OB_MODE_SCULPT) && ob->sculpt) { /* create PBVH immediately (would be created on the fly too, - but this avoids waiting on first stroke) */ + * but this avoids waiting on first stroke) */ ob->sculpt->pbvh= ob->derivedFinal->getPBVH(ob, ob->derivedFinal); } } diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 4a852bb0233..474aa84fec6 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -701,14 +701,17 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, GPU_normal_setup( dm ); GPU_uv_setup( dm ); if ( col != NULL ) { - /*if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) { +#if 0 + if ( realcol && dm->drawObject->colType == CD_TEXTURE_MCOL ) { col = 0; } else if ( mcol && dm->drawObject->colType == CD_MCOL ) { col = 0; } - if ( col != 0 ) {*/ + if ( col != 0 ) +#endif + { unsigned char *colors = MEM_mallocN(dm->getNumTessFaces(dm)*4*3*sizeof(unsigned char), "cdDM_drawFacesTex_common"); for ( i=0; i < dm->getNumTessFaces(dm); i++ ) { for ( j=0; j < 4; j++ ) { @@ -724,7 +727,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, dm->drawObject->colType = CD_TEXTURE_MCOL; else if (mcol) dm->drawObject->colType = CD_MCOL; - //} + } GPU_color_setup( dm ); } diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 7cc7a82df66..afb5e85ffa8 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2167,7 +2167,7 @@ void CustomData_bmesh_merge(CustomData *source, CustomData *dest, int t; /* copy old layer description so that old data can be copied into - the new allocation */ + * the new allocation */ destold = *dest; if (destold.layers) destold.layers = MEM_dupallocN(destold.layers); diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index ccaa03ad9d9..574c2842144 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -1309,11 +1309,11 @@ DagNodeQueue * graph_dfs(void) /* is_cycle = 1; */ /* UNUSED */ } else if (itA->node->color == DAG_BLACK) { - ; /* already processed node but we may want later to change distance either to shorter to longer. * DFS_dist is the first encounter */ - /*if (node->DFS_dist >= itA->node->DFS_dist) +#if 0 + if (node->DFS_dist >= itA->node->DFS_dist) itA->node->DFS_dist = node->DFS_dist + 1; fprintf(stderr,"dfs forward or cross edge :%15s %i-%i %15s %i-%i\n", @@ -1323,7 +1323,7 @@ DagNodeQueue * graph_dfs(void) ((ID *) itA->node->ob)->name, itA->node->DFS_dvtm, itA->node->DFS_fntm); - */ +#endif } else fprintf(stderr,"dfs unknown edge\n"); diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index 0bb9426730e..a4edc1e531a 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -1424,9 +1424,9 @@ typedef struct HairGridVert { #define HAIR_GRID_INDEX(vec, min, max, axis) (int)((vec[axis] - min[axis]) / (max[axis] - min[axis]) * 9.99f) /* Smoothing of hair velocities: * adapted from - Volumetric Methods for Simulation and Rendering of Hair - by Lena Petrovic, Mark Henne and John Anderson - * Pixar Technical Memo #06-08, Pixar Animation Studios + * Volumetric Methods for Simulation and Rendering of Hair + * by Lena Petrovic, Mark Henne and John Anderson + * Pixar Technical Memo #06-08, Pixar Animation Studios */ static void hair_velocity_smoothing(ClothModifierData *clmd, lfVector *lF, lfVector *lX, lfVector *lV, unsigned int numverts) { @@ -1591,8 +1591,8 @@ static void cloth_calc_force(ClothModifierData *clmd, float UNUSED(frame), lfVec hair_velocity_smoothing(clmd, lF, lX, lV, numverts); /* multiply lF with mass matrix - // force = mass * acceleration (in this case: gravity) - */ + * force = mass * acceleration (in this case: gravity) + */ for (i = 0; i < numverts; i++) { float temp[3]; @@ -1745,10 +1745,10 @@ static void simulate_implicit_euler(lfVector *Vnew, lfVector *UNUSED(lX), lfVect del_lfvector(dFdXmV); } -/*computes where the cloth would be if it were subject to perfectly stiff edges - (edge distance constraints) in a lagrangian solver. then add forces to help - guide the implicit solver to that state. this function is called after - collisions*/ +/* computes where the cloth would be if it were subject to perfectly stiff edges + * (edge distance constraints) in a lagrangian solver. then add forces to help + * guide the implicit solver to that state. this function is called after + * collisions*/ int cloth_calc_helper_forces(Object *UNUSED(ob), ClothModifierData * clmd, float (*initial_cos)[3], float UNUSED(step), float dt) { Cloth *cloth= clmd->clothObject; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index af24240bf4a..ea2e634ed64 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -3038,7 +3038,7 @@ int poly_get_adj_loops_from_vert(unsigned adj_r[3], const MPoly *poly, } /* update the hide flag for edges and faces from the corresponding - flag in verts */ + * flag in verts */ void mesh_flush_hidden_from_verts(const MVert *mvert, const MLoop *mloop, MEdge *medge, int totedge, diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 2167495ef08..7580f2eee4d 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -104,7 +104,7 @@ static BLI_bitmap multires_mdisps_upsample_hidden(BLI_bitmap lo_hidden, int hi_level, /* assumed to be at hi_level (or - null) */ + * null) */ BLI_bitmap prev_hidden) { BLI_bitmap subd; @@ -144,8 +144,8 @@ static BLI_bitmap multires_mdisps_upsample_hidden(BLI_bitmap lo_hidden, if (prev_hidden) { /* If prev_hidden is available, copy it to - subd, except when the equivalent element in - lo_hidden is different */ + * subd, except when the equivalent element in + * lo_hidden is different */ if (lo_val != prev_hidden[hi_ndx]) BLI_BITMAP_MODIFY(subd, hi_ndx, lo_val); else @@ -215,7 +215,7 @@ static void multires_output_hidden_to_ccgdm(CCGDerivedMesh *ccgdm, } /* subdivide mdisps.hidden if needed (assumes that md.level reflects - the current level of md.hidden) */ + * the current level of md.hidden) */ static void multires_mdisps_subdivide_hidden(MDisps *md, int new_level) { BLI_bitmap subd; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 975602c2918..27f5f7d9eb1 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -151,7 +151,7 @@ void copy_paint(Paint *src, Paint *tar) } /* returns non-zero if any of the face's vertices - are hidden, zero otherwise */ + * are hidden, zero otherwise */ int paint_is_face_hidden(const MFace *f, const MVert *mvert) { return ((mvert[f->v1].flag & ME_HIDE) || @@ -161,8 +161,8 @@ int paint_is_face_hidden(const MFace *f, const MVert *mvert) } /* returns non-zero if any of the corners of the grid - face whose inner corner is at (x,y) are hidden, - zero otherwise */ + * face whose inner corner is at (x,y) are hidden, + * zero otherwise */ int paint_is_grid_face_hidden(const unsigned int *grid_hidden, int gridsize, int x, int y) { diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 52f59fb8b80..8015e53e4c9 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -1781,7 +1781,7 @@ static float check_zone(WipeZone *wipezone, int x, int y, /* BOX WIPE IS NOT WORKING YET */ /* case DO_CROSS_WIPE: */ /* BOX WIPE IS NOT WORKING YET */ - /* +#if 0 case DO_BOX_WIPE: if (invert)facf0 = 1-facf0; @@ -1843,7 +1843,7 @@ static float check_zone(WipeZone *wipezone, int x, int y, } break; -*/ +#endif case DO_IRIS_WIPE: if (xo > yo) yo = xo; else xo = yo; diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 97edba7d9ef..2d4397d16cd 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -2192,7 +2192,7 @@ static ImBuf *seq_render_strip(SeqRenderData context, Sequence *seq, float cfra) ibuf = seq_stripelem_cache_get(context, seq, cfra, SEQ_STRIPELEM_IBUF); /* currently, we cache preprocessed images in SEQ_STRIPELEM_IBUF, - * but not(!) on SEQ_STRIPELEM_IBUF_ENDSTILL and ..._STARTSTILL */ + * but not(!) on SEQ_STRIPELEM_IBUF_ENDSTILL and ..._STARTSTILL */ if (ibuf) use_preprocess = FALSE; @@ -2685,10 +2685,10 @@ static void seq_start_threads(Scene *scene) seq_last_given_monoton_cfra = monoton_cfra = 0; /* since global structures are modified during the processing - of one frame, only one render thread is currently possible... - - (but we code, in the hope, that we can remove this restriction - soon...) + * of one frame, only one render thread is currently possible... + * + * (but we code, in the hope, that we can remove this restriction + * soon...) */ fprintf(stderr, "SEQ-THREAD: seq_start_threads\n"); @@ -2942,7 +2942,7 @@ void free_imbuf_seq(Scene *scene, ListBase *seqbase, int check_mem_usage, } if (seq->type == SEQ_SCENE) { /* FIXME: recurs downwards, - but do recurs protection somehow! */ + * but do recurs protection somehow! */ } } @@ -3394,7 +3394,7 @@ static void seq_update_muting_recursive(ListBase *seqbasep, Sequence *metaseq, i int seqmute; /* for sound we go over full meta tree to update muted state, - * since sound is played outside of evaluating the imbufs, */ + * since sound is played outside of evaluating the imbufs, */ for (seq = seqbasep->first; seq; seq = seq->next) { seqmute = (mute || (seq->flag & SEQ_MUTE)); diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index a4f7a9697bf..83a24f6afdc 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -975,7 +975,7 @@ static void ccgDM_getFinalFace(DerivedMesh *dm, int faceNum, MFace *mf) } /* Translate GridHidden into the ME_HIDE flag for MVerts. Assumes - vertices are in the order output by ccgDM_copyFinalVertArray. */ + * vertices are in the order output by ccgDM_copyFinalVertArray. */ void subsurf_copy_grid_hidden(DerivedMesh *dm, const MPoly *mpoly, MVert *mvert, const MDisps *mdisps) { diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 740deb5c7db..59c38117858 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -172,7 +172,7 @@ static AVFrame* alloc_picture(int pix_fmt, int width, int height) } /* Get the correct file extensions for the requested format, - first is always desired guess_format parameter */ + * first is always desired guess_format parameter */ static const char** get_file_extensions(int format) { switch(format) { @@ -308,7 +308,7 @@ static AVFrame* generate_video_frame(uint8_t* pixels, ReportList *reports) rendered_frame = pixels; /* Do RGBA-conversion and flipping in one step depending - on CPU-Endianess */ + * on CPU-Endianess */ if (ENDIAN_ORDER == L_ENDIAN) { int y; @@ -628,7 +628,7 @@ static AVStream* alloc_audio_stream(RenderData *rd, int codec_id, AVFormatContex } /* need to prevent floating point exception when using vorbis audio codec, - initialize this value in the same way as it's done in FFmpeg iteslf (sergey) */ + * initialize this value in the same way as it's done in FFmpeg iteslf (sergey) */ st->codec->time_base.num= 1; st->codec->time_base.den= st->codec->sample_rate; @@ -876,8 +876,8 @@ void flush_ffmpeg(void) } /* ********************************************************************** - * public interface - ********************************************************************** */ + * * public interface + * ********************************************************************** */ /* Get the output filename-- similar to the other output formats */ void filepath_ffmpeg(char* string, RenderData* rd) |