diff options
61 files changed, 318 insertions, 305 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) diff --git a/source/blender/blenlib/BLI_pbvh.h b/source/blender/blenlib/BLI_pbvh.h index 210238efcfd..e6578390ea6 100644 --- a/source/blender/blenlib/BLI_pbvh.h +++ b/source/blender/blenlib/BLI_pbvh.h @@ -160,7 +160,7 @@ int BLI_pbvh_isDeformed(struct PBVH *pbvh); * - spend most of the time in the relatively simple inner loop */ /* note: PBVH_ITER_ALL does not skip hidden vertices, - PBVH_ITER_UNIQUE does */ + * PBVH_ITER_UNIQUE does */ #define PBVH_ITER_ALL 0 #define PBVH_ITER_UNIQUE 1 diff --git a/source/blender/blenlib/intern/fnmatch.c b/source/blender/blenlib/intern/fnmatch.c index ae04075bda6..53172957560 100644 --- a/source/blender/blenlib/intern/fnmatch.c +++ b/source/blender/blenlib/intern/fnmatch.c @@ -30,12 +30,12 @@ /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C - Library, but also included in many other GNU distributions. Compiling - and linking in this code is a waste when using the GNU C library - (especially if it is a shared library). Rather than having every GNU - program understand `configure --with-gnu-libc' and omit the object files, - it is simpler to just do this in the source for each such file. */ + * actually compiling the library itself. This code is part of the GNU C + * Library, but also included in many other GNU distributions. Compiling + * and linking in this code is a waste when using the GNU C library + * (especially if it is a shared library). Rather than having every GNU + * program understand `configure --with-gnu-libc' and omit the object files, + * it is simpler to just do this in the source for each such file. */ #if defined _LIBC || !defined __GNU_LIBRARY__ diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index b92e5d39b4b..a81656d7ded 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -2973,8 +2973,8 @@ static float ff_quad_form_factor(float *p, float *n, float *q0, float *q1, float static __m128 sse_approx_acos(__m128 x) { /* needs a better approximation than taylor expansion of acos, since that - * gives big erros for near 1.0 values, sqrt(2 * x) * acos(1 - x) should work - * better, see http://www.tom.womack.net/projects/sse-fast-arctrig.html */ + * gives big erros for near 1.0 values, sqrt(2 * x) * acos(1 - x) should work + * better, see http://www.tom.womack.net/projects/sse-fast-arctrig.html */ return _mm_set_ps1(1.0f); } diff --git a/source/blender/blenlib/intern/storage.c b/source/blender/blenlib/intern/storage.c index f4070f76519..1c55d5b5a39 100644 --- a/source/blender/blenlib/intern/storage.c +++ b/source/blender/blenlib/intern/storage.c @@ -472,9 +472,9 @@ int BLI_exists(const char *name) #else struct _stati64 st; #endif - /* in Windows stat doesn't recognize dir ending on a slash - To not break code where the ending slash is expected we - don't mess with the argument name directly here - elubie */ + /* in Windows stat doesn't recognize dir ending on a slash + * To not break code where the ending slash is expected we + * don't mess with the argument name directly here - elubie */ wchar_t * tmp_16 = alloc_utf16_from_8(name, 0); int len, res; len = wcslen(tmp_16); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 74988546a42..f87be2b8a83 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -612,7 +612,7 @@ static void bh4_from_bh8(BHead *bhead, BHead8 *bhead8, int do_endian_swap) } /* this patch is to avoid a long long being read from not-eight aligned positions - is necessary on any modern 64bit architecture) */ + * is necessary on any modern 64bit architecture) */ memcpy(&old, &bhead8->old, 8); bhead4->old = (int) (old >> 3); @@ -1138,7 +1138,7 @@ int BLO_is_a_library(const char *path, char *dir, char *group) if (!fd || !BLO_has_bfile_extension(fd+1)) return 0; /* now we know that we are in a blend file and it is safe to - assume that gp actually points to a group */ + * assume that gp actually points to a group */ if (strcmp("Screen", gp)!=0) BLI_strncpy(group, gp, GROUP_MAX); } @@ -1606,7 +1606,7 @@ static void IDP_DirectLinkProperty(IDProperty *prop, int switch_endian, FileData * in the same field as int val; val2 in the * IDPropertyData struct, they have to deal with * endianness specifically - + * * in theory, val and val2 would've already been swapped * if switch_endian is true, so we have to first unswap * them then reswap them as a single 64-bit entity. @@ -2290,17 +2290,19 @@ static void lib_nodetree_do_versions_update_cb(void *UNUSED(data), ID *UNUSED(id /* verify types for nodes and groups, all data has to be read */ /* open = 0: appending/linking, open = 1: open new file (need to clean out dynamic -* typedefs*/ + * typedefs */ static void lib_verify_nodetree(Main *main, int UNUSED(open)) { bNodeTree *ntree; int i; bNodeTreeType *ntreetype; - /* this crashes blender on undo/redo + /* this crashes blender on undo/redo */ +#if 0 if (open==1) { reinit_nodesystem(); - }*/ + } +#endif /* set node->typeinfo pointers */ for (i=0; i < NUM_NTREE_TYPES; ++i) { @@ -2936,12 +2938,12 @@ static void direct_link_text(FileData *fd, Text *text) text->compiled= NULL; -/* +#if 0 if (text->flags & TXT_ISEXT) { reopen_text(text); } else { -*/ +#endif link_list(fd, &text->lines); link_list(fd, &text->markers); @@ -3242,8 +3244,8 @@ static void lib_link_material(FileData *fd, Main *main) if (ma->id.flag & LIB_NEEDLINK) { if (ma->adt) lib_link_animdata(fd, &ma->id, ma->adt); - /*Link ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + /* Link ID Properties -- and copy this comment EXACTLY for easy finding + * of library blocks that implement this.*/ if (ma->id.properties) IDP_LibLinkProperty(ma->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); ma->ipo= newlibadr_us(fd, ma->id.lib, ma->ipo); @@ -3683,8 +3685,8 @@ static void lib_link_mesh(FileData *fd, Main *main) if (me->id.flag & LIB_NEEDLINK) { int i; - /*Link ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + /* Link ID Properties -- and copy this comment EXACTLY for easy finding + * of library blocks that implement this.*/ if (me->id.properties) IDP_LibLinkProperty(me->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); if (me->adt) lib_link_animdata(fd, &me->id, me->adt); @@ -3709,7 +3711,7 @@ static void lib_link_mesh(FileData *fd, Main *main) /*check if we need to convert mfaces to mpolys*/ if (me->totface && !me->totpoly) { /* temporarily switch main so that reading from - external CustomData works */ + * external CustomData works */ Main *gmain = G.main; G.main = main; @@ -3779,9 +3781,9 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte if (mdisps[i].totdisp && !mdisps[i].level) { /* this calculation is only correct for loop mdisps; - if loading pre-BMesh face mdisps this will be - overwritten with the correct value in - bm_corners_to_loops() */ + * if loading pre-BMesh face mdisps this will be + * overwritten with the correct value in + * bm_corners_to_loops() */ float gridsize = sqrtf(mdisps[i].totdisp); mdisps[i].level = (int)(logf(gridsize - 1.0f) / M_LN2) + 1; } @@ -3852,7 +3854,7 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) direct_link_animdata(fd, mesh->adt); /* normally direct_link_dverts should be called in direct_link_customdata, - but for backwards compat in do_versions to work we do it here */ + * but for backwards compat in do_versions to work we do it here */ direct_link_dverts(fd, mesh->totvert, mesh->dvert); direct_link_customdata(fd, &mesh->vdata, mesh->totvert); @@ -3912,11 +3914,11 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) mesh->mr->verts = newdataadr(fd, mesh->mr->verts); /* If mesh has the same number of vertices as the - highest multires level, load the current mesh verts - into multires and discard the old data. Needed - because some saved files either do not have a verts - array, or the verts array contains out-of-date - data. */ + * highest multires level, load the current mesh verts + * into multires and discard the old data. Needed + * because some saved files either do not have a verts + * array, or the verts array contains out-of-date + * data. */ if (mesh->totvert == ((MultiresLevel*)mesh->mr->levels.last)->totvert) { if (mesh->mr->verts) MEM_freeN(mesh->mr->verts); @@ -4567,7 +4569,7 @@ static void direct_link_object(FileData *fd, Object *ob) ob->flag &= ~OB_FROMGROUP; /* loading saved files with editmode enabled works, but for undo we like - to stay in object mode during undo presses so keep editmode disabled */ + * to stay in object mode during undo presses so keep editmode disabled */ if (fd->memfile) ob->mode &= ~(OB_MODE_EDIT|OB_MODE_PARTICLE_EDIT); @@ -4802,8 +4804,8 @@ static void lib_link_scene(FileData *fd, Main *main) sce= main->scene.first; while (sce) { if (sce->id.flag & LIB_NEEDLINK) { - /*Link ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + /* Link ID Properties -- and copy this comment EXACTLY for easy finding + * of library blocks that implement this.*/ if (sce->id.properties) IDP_LibLinkProperty(sce->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd); if (sce->adt) lib_link_animdata(fd, &sce->id, sce->adt); @@ -5222,7 +5224,7 @@ static void butspace_version_132(SpaceButs *buts) } /* note: file read without screens option G_FILE_NO_UI; - check lib pointers in call below */ + * check lib pointers in call below */ static void lib_link_screen(FileData *fd, Main *main) { bScreen *sc; @@ -5744,7 +5746,7 @@ static void direct_link_screen(FileData *fd, bScreen *sc) sc->swap= 0; /* hacky patch... but people have been saving files with the verse-blender, - causing the handler to keep running for ever, with no means to disable it */ + * causing the handler to keep running for ever, with no means to disable it */ for (a=0; a<SCREEN_MAXHANDLER; a+=2) { if ( sc->handler[a]==SCREEN_HANDLER_VERSE) { sc->handler[a]= 0; @@ -5921,9 +5923,9 @@ static void direct_link_screen(FileData *fd, bScreen *sc) //for (cl= sconsole->scrollback.first; cl; cl= cl->next) // cl->line= newdataadr(fd, cl->line); - /*comma expressions, (e.g. expr1, expr2, expr3) evalutate each expression, - from left to right. the right-most expression sets the result of the comma - expression as a whole*/ + /* comma expressions, (e.g. expr1, expr2, expr3) evalutate each expression, + * from left to right. the right-most expression sets the result of the comma + * expression as a whole*/ for (cl= sconsole->history.first; cl; cl= cl_next) { cl_next= cl->next; cl->line= newdataadr(fd, cl->line); @@ -6064,8 +6066,10 @@ static void direct_link_speaker(FileData *fd, Speaker *spk) spk->adt= newdataadr(fd, spk->adt); direct_link_animdata(fd, spk->adt); - /*spk->sound= newdataadr(fd, spk->sound); - direct_link_sound(fd, spk->sound);*/ +#if 0 + spk->sound= newdataadr(fd, spk->sound); + direct_link_sound(fd, spk->sound); +#endif } /* ************** READ SOUND ******************* */ @@ -7395,7 +7399,7 @@ static void do_version_mdef_250(Main *main) if (mmd->bindcos) { /* make bindcos NULL in order to trick older versions - into thinking that the mesh was not bound yet */ + * into thinking that the mesh was not bound yet */ mmd->bindcagecos= mmd->bindcos; mmd->bindcos= NULL; @@ -8538,9 +8542,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) bScreen *sc; Object *ob; - /* As of now, this insures that the transition from the old Track system - to the new full constraint Track is painless for everyone. - theeth - */ + /* As of now, this insures that the transition from the old Track system + * to the new full constraint Track is painless for everyone. - theeth + */ ob = main->object.first; while (ob) { @@ -8548,7 +8552,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) list = &ob->constraints; /* check for already existing TrackTo constraint - set their track and up flag correctly */ + * set their track and up flag correctly */ if (list) { bConstraint *curcon; @@ -8626,8 +8630,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) Object *ob; - /* As of now, this insures that the transition from the old Track system - to the new full constraint Track is painless for everyone.*/ + /* As of now, this insures that the transition from the old Track system + * to the new full constraint Track is painless for everyone.*/ ob = main->object.first; while (ob) { @@ -8635,7 +8639,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) list = &ob->constraints; /* check for already existing TrackTo constraint - set their track and up flag correctly */ + * set their track and up flag correctly */ if (list) { bConstraint *curcon; @@ -8736,9 +8740,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } } /* ton: made this 230 instead of 229, - to be sure (tuho files) and this is a reliable check anyway - nevertheless, we might need to think over a fitness (initialize) - check apart from the do_versions() */ + * to be sure (tuho files) and this is a reliable check anyway + * nevertheless, we might need to think over a fitness (initialize) + * check apart from the do_versions() */ if (main->versionfile <= 230) { bScreen *sc; @@ -9518,7 +9522,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) list = &ob->constraints; /* check for already existing MinMax (floor) constraint - and update the sticky flagging */ + * and update the sticky flagging */ if (list) { bConstraint *curcon; @@ -9944,7 +9948,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) } /* Copy over old per-level multires vertex data - into a single vertex array in struct Multires */ + * into a single vertex array in struct Multires */ for (me = main->mesh.first; me; me=me->id.next) { if (me->mr && !me->mr->verts) { MultiresLevel *lvl = me->mr->levels.last; @@ -10728,7 +10732,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) ob->m_contactProcessingThreshold = 1.0f; //pad3 is used for m_contactProcessingThreshold if (ob->parent) { /* check if top parent has compound shape set and if yes, set this object - to compound shaper as well (was the behavior before, now it's optional) */ + * to compound shaper as well (was the behavior before, now it's optional) */ Object *parent= newlibadr(fd, lib, ob->parent); while (parent && parent != ob && parent->parent != NULL) { parent = newlibadr(fd, lib, parent->parent); @@ -10848,8 +10852,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) seq->sound = sound_new_file(main, str); } /* don't know, if anybody used that - this way, but just in case, upgrade - to new way... */ + * this way, but just in case, upgrade + * to new way... */ if ((seq->flag & SEQ_USE_PROXY_CUSTOM_FILE) && !(seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)) { @@ -11309,8 +11313,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) int a, tot; /* shape keys are no longer applied to the mesh itself, but rather - to the derivedmesh/displist, so here we ensure that the basis - shape key is always set in the mesh coordinates. */ + * to the derivedmesh/displist, so here we ensure that the basis + * shape key is always set in the mesh coordinates. */ for (me= main->mesh.first; me; me= me->id.next) { if ((key = newlibadr(fd, lib, me->key)) && key->refkey) { @@ -11427,9 +11431,9 @@ static void do_versions(FileData *fd, Library *lib, Main *main) int i, convert=0; /* convert to new color management system: - while previously colors were stored as srgb, - now they are stored as linear internally, - with screen gamma correction in certain places in the UI. */ + * while previously colors were stored as srgb, + * now they are stored as linear internally, + * with screen gamma correction in certain places in the UI. */ /* don't know what scene is active, so we'll convert if any scene has it enabled... */ while (sce) { @@ -11714,7 +11718,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (main->versionfile < 250 || (main->versionfile == 250 && main->subversionfile < 13)) { /* NOTE: if you do more conversion, be sure to do it outside of this and - increase subversion again, otherwise it will not be correct */ + * increase subversion again, otherwise it will not be correct */ Object *ob; /* convert degrees to radians for internal use */ @@ -12781,7 +12785,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) for (sce=main->scene.first; sce; sce=sce->id.next) { /* there are files with invalid audio_channels value, the real cause - is unknown, but we fix it here anyway to avoid crashes */ + * is unknown, but we fix it here anyway to avoid crashes */ if (sce->r.ffcodecdata.audio_channels == 0) sce->r.ffcodecdata.audio_channels = 2; @@ -13118,7 +13122,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) { /* convert deprecated sculpt_paint_unified_* fields to - UnifiedPaintSettings */ + * UnifiedPaintSettings */ Scene *scene; for (scene= main->scene.first; scene; scene= scene->id.next) { ToolSettings *ts= scene->toolsettings; @@ -13193,7 +13197,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (main->versionfile < 263) { /* set fluidsim rate. the version patch for this in 2.62 was wrong, so - try to correct it, if rate is 0.0 that's likely not intentional */ + * try to correct it, if rate is 0.0 that's likely not intentional */ Object *ob; for (ob = main->object.first; ob; ob = ob->id.next) { @@ -13452,10 +13456,10 @@ BlendFileData *blo_read_file_internal(FileData *fd, const char *filepath) case ID_LI: /* skip library datablocks in undo, this works together with - BLO_read_from_memfile, where the old main->library is restored - overwriting the libraries from the memory file. previously - it did not save ID_LI/ID_ID blocks in this case, but they are - needed to make quit.blend recover them correctly. */ + * BLO_read_from_memfile, where the old main->library is restored + * overwriting the libraries from the memory file. previously + * it did not save ID_LI/ID_ID blocks in this case, but they are + * needed to make quit.blend recover them correctly. */ if (fd->memfile) bhead= blo_nextbhead(fd, bhead); else @@ -13625,7 +13629,7 @@ static void expand_doit(FileData *fd, Main *mainvar, void *old) /* This crashes files, must look further into it */ /* Update: the issue is that in file reading, the oldnewmap is OK, but for existing data, it has to be - inserted in the map to be found! */ + * inserted in the map to be found! */ if (id->flag & LIB_PRE_EXISTING) oldnewmap_insert(fd->libmap, bhead->old, id, 1); @@ -13644,7 +13648,7 @@ static void expand_doit(FileData *fd, Main *mainvar, void *old) } else { /* this is actually only needed on UI call? when ID was already read before, and another append - happens which invokes same ID... in that case the lookup table needs this entry */ + * happens which invokes same ID... in that case the lookup table needs this entry */ oldnewmap_insert(fd->libmap, bhead->old, id, 1); // commented because this can print way too much // if (G.debug & G_DEBUG) printf("expand: already read %s\n", id->name); @@ -14430,11 +14434,11 @@ static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, const if ( ob->id.flag & LIB_INDIRECT ) { - /* IF below is quite confusing! - if we are appending, but this object wasnt just added along with a group, - then this is already used indirectly in the scene somewhere else and we didnt just append it. - - (ob->id.flag & LIB_PRE_EXISTING)==0 means that this is a newly appended object - Campbell */ + /* IF below is quite confusing! + * if we are appending, but this object wasnt just added along with a group, + * then this is already used indirectly in the scene somewhere else and we didnt just append it. + * + * (ob->id.flag & LIB_PRE_EXISTING)==0 means that this is a newly appended object - Campbell */ if (is_group_append==0 || (ob->id.flag & LIB_PRE_EXISTING)==0) { int do_it= 0; @@ -14512,7 +14516,7 @@ static void give_base_to_groups(Main *mainvar, Scene *scene) } /* returns true if the item was found -* but it may already have already been appended/linked */ + * but it may already have already been appended/linked */ static ID *append_named_part(Main *mainl, FileData *fd, const char *idname, const short idcode) { BHead *bhead; diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 5a8cb2ede20..0f2990a9157 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -488,7 +488,7 @@ static void write_fmodifiers(WriteData *wd, ListBase *fmodifiers) FMod_Python *data = (FMod_Python *)fcm->data; /* Write ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + * of library blocks that implement this.*/ IDP_WriteProperty(data->prop, wd); } break; @@ -1212,7 +1212,7 @@ static void write_constraints(WriteData *wd, ListBase *conlist) writestruct(wd, DATA, "bConstraintTarget", 1, ct); /* Write ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + * of library blocks that implement this.*/ IDP_WriteProperty(data->prop, wd); } break; @@ -1244,7 +1244,7 @@ static void write_pose(WriteData *wd, bPose *pose) /* Write channels */ for (chan=pose->chanbase.first; chan; chan=chan->next) { /* Write ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + * of library blocks that implement this.*/ if (chan->prop) IDP_WriteProperty(chan->prop, wd); @@ -1417,8 +1417,8 @@ static void write_objects(WriteData *wd, ListBase *idbase) /* write LibData */ writestruct(wd, ID_OB, "Object", 1, ob); - /*Write ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + /* Write ID Properties -- and copy this comment EXACTLY for easy finding + * of library blocks that implement this.*/ if (ob->id.properties) IDP_WriteProperty(ob->id.properties, wd); if (ob->adt) write_animdata(wd, ob->adt); @@ -1678,8 +1678,8 @@ static void write_customdata(WriteData *wd, ID *id, int count, CustomData *data, CustomData_file_write_info(layer->type, &structname, &structnum); if (structnum) { /* when using partial visibility, the MEdge and MFace layers - are smaller than the original, so their type and count is - passed to make this work */ + * are smaller than the original, so their type and count is + * passed to make this work */ if (layer->type != partial_type) datasize= structnum*count; else datasize= structnum*partial_count; @@ -1800,10 +1800,10 @@ static void write_meshs(WriteData *wd, ListBase *idbase) write_customdata(wd, &mesh->id, mesh->totedge, &mesh->edata, -1, 0); write_customdata(wd, &mesh->id, mesh->totface, &mesh->fdata, -1, 0); /* harmless for older blender versioins but _not_ writing these keeps file size down */ - /* +#if 0 write_customdata(wd, &mesh->id, mesh->totloop, &mesh->ldata, -1, 0); write_customdata(wd, &mesh->id, mesh->totpoly, &mesh->pdata, -1, 0); - */ +#endif /* restore */ mesh->mpoly = backup_mesh.mpoly; @@ -1961,10 +1961,10 @@ static void write_materials(WriteData *wd, ListBase *idbase) /* write LibData */ writestruct(wd, ID_MA, "Material", 1, ma); - /*Write ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ - /*manually set head group property to IDP_GROUP, just in case it hadn't been - set yet :) */ + /* Write ID Properties -- and copy this comment EXACTLY for easy finding + * of library blocks that implement this.*/ + /* manually set head group property to IDP_GROUP, just in case it hadn't been + * set yet :) */ if (ma->id.properties) IDP_WriteProperty(ma->id.properties, wd); if (ma->adt) write_animdata(wd, ma->adt); @@ -2468,7 +2468,7 @@ static void write_bone(WriteData *wd, Bone* bone) writestruct(wd, DATA, "Bone", 1, bone); /* Write ID Properties -- and copy this comment EXACTLY for easy finding - of library blocks that implement this.*/ + * of library blocks that implement this.*/ if (bone->prop) IDP_WriteProperty(bone->prop, wd); diff --git a/source/blender/bmesh/intern/bmesh_core.c b/source/blender/bmesh/intern/bmesh_core.c index 3457d295bdc..7d4129b1205 100644 --- a/source/blender/bmesh/intern/bmesh_core.c +++ b/source/blender/bmesh/intern/bmesh_core.c @@ -1179,8 +1179,8 @@ BMFace *bmesh_sfme(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, if (first_loop_f1) { /* original first loop was in f1, find a suitable first loop for f2 - which is as similar as possible to f1. the order matters for tools - such as duplifaces. */ + * which is as similar as possible to f1. the order matters for tools + * such as duplifaces. */ if (f->l_first->prev == f1loop) f2->l_first = f2loop->prev; else if (f->l_first->next == f1loop) diff --git a/source/blender/bmesh/operators/bmo_dissolve.c b/source/blender/bmesh/operators/bmo_dissolve.c index a6d9d26f7ae..fe9e40aad44 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.c +++ b/source/blender/bmesh/operators/bmo_dissolve.c @@ -449,7 +449,8 @@ void dummy_exec(BMesh *bm, BMOperator *op) BM_edge_kill(bm, fe); } } - /* else if (f->len == 3) { +#if 0 + else if (f->len == 3) { BMEdge *ed[3]; BMVert *vt[3]; BMLoop *lp[3]; @@ -465,7 +466,7 @@ void dummy_exec(BMesh *bm, BMOperator *op) if (vt[0] == vt[1] || vt[0] == vt[2]) { i += 1; } - */ +#endif } } if (oldlen == len) break; diff --git a/source/blender/bmesh/operators/bmo_removedoubles.c b/source/blender/bmesh/operators/bmo_removedoubles.c index 8cdb3b9b373..149f2537a12 100644 --- a/source/blender/bmesh/operators/bmo_removedoubles.c +++ b/source/blender/bmesh/operators/bmo_removedoubles.c @@ -118,7 +118,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op) } /* check if any faces are getting their own corners merged - together, split face if so */ + * together, split face if so */ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { remdoubles_splitface(f, bm, op); } @@ -157,7 +157,7 @@ void bmo_weldverts_exec(BMesh *bm, BMOperator *op) bm->elem_index_dirty |= BM_FACE; /* faces get "modified" by creating new faces here, then at the - end the old faces are deleted */ + * end the old faces are deleted */ BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) { if (!BMO_elem_flag_test(bm, f, FACE_MARK)) continue; diff --git a/source/blender/bmesh/operators/bmo_slide.c b/source/blender/bmesh/operators/bmo_slide.c index 57bda579603..5a91fdee533 100644 --- a/source/blender/bmesh/operators/bmo_slide.c +++ b/source/blender/bmesh/operators/bmo_slide.c @@ -21,8 +21,8 @@ */ /** \file blender/bmesh/operators/bmo_slide.c -* \ingroup bmesh -*/ + * \ingroup bmesh + */ #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/include/ED_numinput.h b/source/blender/editors/include/ED_numinput.h index e723ff73532..d51ece58e92 100644 --- a/source/blender/editors/include/ED_numinput.h +++ b/source/blender/editors/include/ED_numinput.h @@ -29,13 +29,13 @@ /* - The ctrl value has different meaning: - 0 : No value has been typed - - otherwise, |value| - 1 is where the cursor is located after the period - Positive : number is positive - Negative : number is negative -*/ + * The ctrl value has different meaning: + * 0 : No value has been typed + * + * otherwise, |value| - 1 is where the cursor is located after the period + * Positive : number is positive + * Negative : number is negative + */ typedef struct NumInput { short idx; diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 2f1075bde19..c903040a6b9 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -168,7 +168,7 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Pointe } /* may meed to add more cases here. - * don't override enum flag names */ + * don't override enum flag names */ /* name is shown above, empty name for button below */ name = (flag & PROP_ENUM_FLAG || is_boolean) ? NULL : ""; diff --git a/source/blender/editors/mesh/editmesh_slide.c b/source/blender/editors/mesh/editmesh_slide.c index 0d49356d9d9..44f7c388a74 100644 --- a/source/blender/editors/mesh/editmesh_slide.c +++ b/source/blender/editors/mesh/editmesh_slide.c @@ -307,7 +307,7 @@ static void vtx_slide_draw(const bContext *C, ARegion *UNUSED(ar), void *arg) } } - /* Draw selected edge + /* Draw selected edge * Add color offset and reduce alpha */ UI_ThemeColorShadeAlpha(TH_EDGE_SELECT, 40, -50); diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 47a4c376f96..1a2e42d691a 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -221,9 +221,9 @@ static int screen_render_exec(bContext *C, wmOperator *op) BKE_image_backup_render(scene, ima); /* cleanup sequencer caches before starting user triggered render. - * otherwise, invalidated cache entries can make their way into - * the output rendering. We can't put that into RE_BlenderFrame, - * since sequence rendering can call that recursively... (peter) */ + * otherwise, invalidated cache entries can make their way into + * the output rendering. We can't put that into RE_BlenderFrame, + * since sequence rendering can call that recursively... (peter) */ seq_stripelem_cache_cleanup(); RE_SetReports(re, op->reports); @@ -517,9 +517,9 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event) multires_force_render_update(CTX_data_active_object(C)); /* cleanup sequencer caches before starting user triggered render. - * otherwise, invalidated cache entries can make their way into - * the output rendering. We can't put that into RE_BlenderFrame, - * since sequence rendering can call that recursively... (peter) */ + * otherwise, invalidated cache entries can make their way into + * the output rendering. We can't put that into RE_BlenderFrame, + * since sequence rendering can call that recursively... (peter) */ seq_stripelem_cache_cleanup(); /* get editmode results */ diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index b56a295864b..35b4126339e 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -146,9 +146,9 @@ void ED_render_engine_changed(Main *bmain) } /***************************** Updates *********************************** -* ED_render_id_flush_update gets called from DAG_id_tag_update, to do * -* editor level updates when the ID changes. when these ID blocks are in * -* the dependency graph, we can get rid of the manual dependency checks */ + * ED_render_id_flush_update gets called from DAG_id_tag_update, to do * + * editor level updates when the ID changes. when these ID blocks are in * + * the dependency graph, we can get rid of the manual dependency checks */ static int mtex_use_tex(MTex **mtex, int tot, Tex *tex) { diff --git a/source/blender/editors/sculpt_paint/paint_hide.c b/source/blender/editors/sculpt_paint/paint_hide.c index 43bb4d33212..c75c1be36f5 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.c +++ b/source/blender/editors/sculpt_paint/paint_hide.c @@ -135,7 +135,7 @@ static void partialvis_update_mesh(Object *ob, } /* Hide or show elements in multires grids with a special GridFlags - customdata layer. */ + * customdata layer. */ static void partialvis_update_grids(Object *ob, PBVH *pbvh, PBVHNode *node, @@ -176,7 +176,7 @@ static void partialvis_update_grids(Object *ob, } else if (action == PARTIALVIS_SHOW && area == PARTIALVIS_ALL) { /* special case if we're showing all, just free the - grid */ + * grid */ MEM_freeN(gh); grid_hidden[g] = NULL; any_changed = 1; @@ -206,7 +206,7 @@ static void partialvis_update_grids(Object *ob, } /* if everything in the grid is now visible, free the grid - flags */ + * flags */ if (!any_hidden) { MEM_freeN(gh); grid_hidden[g] = NULL; @@ -245,9 +245,9 @@ static void clip_planes_from_rect(bContext *C, } /* If mode is inside, get all PBVH nodes that lie at least partially - inside the clip_planes volume. If mode is outside, get all nodes - that lie at least partially outside the volume. If showing all, get - all nodes. */ + * inside the clip_planes volume. If mode is outside, get all nodes + * that lie at least partially outside the volume. If showing all, get + * all nodes. */ static void get_pbvh_nodes(PBVH *pbvh, PBVHNode ***nodes, int *totnode, @@ -328,7 +328,7 @@ static int hide_show_exec(bContext *C, wmOperator *op) sculpt_undo_push_end(); /* ensure that edges and faces get hidden as well (not used by - sculpt but it looks wrong when entering editmode otherwise) */ + * sculpt but it looks wrong when entering editmode otherwise) */ if (pbvh_type == PBVH_FACES) { mesh_flush_hidden_from_verts(me->mvert, me->mloop, me->medge, me->totedge, diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index d381aa5b536..3b6e21cb3f2 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -3001,7 +3001,7 @@ static void project_paint_begin(ProjPaintState *ps) /* Note, use the original mesh for getting the clone and mask layer index - * this avoids re-generating the derived mesh just to get the new index */ + * this avoids re-generating the derived mesh just to get the new index */ if (ps->do_layer_clone) { //int layer_num = CustomData_get_clone_layer(&ps->dm->faceData, CD_MTFACE); int layer_num = CustomData_get_clone_layer(&((Mesh *)ps->ob->data)->fdata, CD_MTFACE); diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 5a64c30b79d..157be337823 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -645,7 +645,7 @@ static float tex_strength(SculptSession *ss, Brush *br, float point[3], float jnk; /* Get strength by feeding the vertex - * location directly into a texture */ + * location directly into a texture */ externtex(mtex, point, &avg, &jnk, &jnk, &jnk, &jnk, 0); } @@ -2556,16 +2556,18 @@ static void calc_brushdata_symm(Sculpt *sd, StrokeCache *cache, const char symm, flip_coord(cache->view_normal, cache->true_view_normal, symm); /* XXX This reduces the length of the grab delta if it approaches the line of symmetry - XXX However, a different approach appears to be needed - if (sd->flags & SCULPT_SYMMETRY_FEATHER) { - float frac = 1.0f/max_overlap_count(sd); - float reduce = (feather-frac)/(1-frac); + * XXX However, a different approach appears to be needed */ +#if 0 + if (sd->flags & SCULPT_SYMMETRY_FEATHER) { + float frac = 1.0f/max_overlap_count(sd); + float reduce = (feather-frac)/(1-frac); - printf("feather: %f frac: %f reduce: %f\n", feather, frac, reduce); + printf("feather: %f frac: %f reduce: %f\n", feather, frac, reduce); - if (frac < 1) - mul_v3_fl(cache->grab_delta_symmetry, reduce); - } */ + if (frac < 1) + mul_v3_fl(cache->grab_delta_symmetry, reduce); + } +#endif unit_m4(cache->symm_rot_mat); unit_m4(cache->symm_rot_mat_inv); diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index fd1c6984346..4545c498fed 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -146,8 +146,8 @@ typedef struct UvSculptData { /*********** Improved Laplacian Relaxation Operator ************************/ /* original code by Raul Fernandez Hernandez "farsthary" * -* adapted to uv smoothing by Antony Riakiatakis * -***************************************************************************/ + * adapted to uv smoothing by Antony Riakiatakis * + ***************************************************************************/ typedef struct Temp_UvData { float sum_co[2], p[2], b[2], sum_b[2]; diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 9832cfb3227..ecbd9a4033a 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -602,7 +602,7 @@ static void rna_update_cb(bContext *C, void *arg_cb, void *UNUSED(arg)) RNAUpdateCb *cb = (RNAUpdateCb *)arg_cb; /* ideally this would be done by RNA itself, but there we have - * no image user available, so we just update this flag here */ + * no image user available, so we just update this flag here */ cb->iuser->ok = 1; /* we call update here on the pointer property, this way the diff --git a/source/blender/editors/space_node/node_select.c b/source/blender/editors/space_node/node_select.c index 15d7986a5c4..4df60e6eede 100644 --- a/source/blender/editors/space_node/node_select.c +++ b/source/blender/editors/space_node/node_select.c @@ -441,8 +441,8 @@ static int node_mouse_select(Main *bmain, SpaceNode *snode, ARegion *ar, const i } else { /* only allow one selected output per node, for sensible linking. - * allows selecting outputs from different nodes though. - */ + * allows selecting outputs from different nodes though. + */ if (node) { for (tsock=node->outputs.first; tsock; tsock=tsock->next) node_socket_deselect(node, tsock, 1); diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index f6b03a5fac3..6407f91aefc 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1744,7 +1744,7 @@ static int game_engine_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* redraw to hide any menus/popups, we don't go back to - * the window manager until after this operator exits */ + * the window manager until after this operator exits */ WM_redraw_windows(C); rv3d = CTX_wm_region_view3d(C); diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index d1dbdbb09c7..62c82c58adf 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4710,7 +4710,7 @@ void projectSVData(TransInfo *t, int final) return; /* don't do this at all for non-basis shape keys, too easy to - accidentally break uv maps or vertex colors then */ + * accidentally break uv maps or vertex colors then */ if (em->bm->shapenr > 1) return; diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c index 387b138cbfb..5a0fb69a26c 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c @@ -245,7 +245,7 @@ static ParamHandle *construct_param_handle(Scene *scene, BMEditMesh *em, if (efa->len == 3 || efa->len == 4) { /* for quads let parametrize split, it can make better decisions - about which split is best for unwrapping than scanfill */ + * about which split is best for unwrapping than scanfill */ i = 0; BM_ITER_ELEM (l, &liter, efa, BM_LOOPS_OF_FACE) { MLoopUV *luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV); @@ -1569,7 +1569,7 @@ static int cube_project_exec(bContext *C, wmOperator *op) cube_size = RNA_float_get(op->ptr, "cube_size"); /* choose x,y,z axis for projection depending on the largest normal - * component, but clusters all together around the center of map. */ + * component, but clusters all together around the center of map. */ BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) { int first = 1; diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 869cc0444aa..1dee327a066 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -154,7 +154,7 @@ static void gpu_buffer_pool_delete_last(GPUBufferPool *pool) } /* free a GPUBufferPool; also frees the data in the pool's - GPUBuffers */ + * GPUBuffers */ static void gpu_buffer_pool_free(GPUBufferPool *pool) { if (!pool) @@ -184,7 +184,7 @@ void GPU_global_buffer_pool_free(void) } /* get a GPUBuffer of at least `size' bytes; uses one from the buffer - pool if possible, otherwise creates a new one */ + * pool if possible, otherwise creates a new one */ GPUBuffer *GPU_buffer_alloc(int size) { GPUBufferPool *pool; @@ -194,13 +194,13 @@ GPUBuffer *GPU_buffer_alloc(int size) pool = gpu_get_global_buffer_pool(); /* not sure if this buffer pool code has been profiled much, - seems to me that the graphics driver and system memory - management might do this stuff anyway. --nicholas - */ + * seems to me that the graphics driver and system memory + * management might do this stuff anyway. --nicholas + */ /* check the global buffer pool for a recently-deleted buffer - that is at least as big as the request, but not more than - twice as big */ + * that is at least as big as the request, but not more than + * twice as big */ for (i = 0; i < pool->totbuf; i++) { bufsize = pool->buffers[i]->size; @@ -210,11 +210,11 @@ GPUBuffer *GPU_buffer_alloc(int size) break; } /* smaller buffers won't fit data and buffers at least - twice as big are a waste of memory */ + * twice as big are a waste of memory */ else if (bufsize > size && size > (bufsize / 2)) { /* is it closer to the required size than the - last appropriate buffer found. try to save - memory */ + * last appropriate buffer found. try to save + * memory */ if (bestfit == -1 || pool->buffers[bestfit]->size > bufsize) { bestfit = i; } @@ -222,7 +222,7 @@ GPUBuffer *GPU_buffer_alloc(int size) } /* if an acceptable buffer was found in the pool, remove it - from the pool and return it */ + * from the pool and return it */ if (bestfit != -1) { buf = pool->buffers[bestfit]; gpu_buffer_pool_remove_index(pool, bestfit); @@ -235,7 +235,7 @@ GPUBuffer *GPU_buffer_alloc(int size) if (useVBOs == 1) { /* create a new VBO and initialize it to the requested - size */ + * size */ glGenBuffersARB(1, &buf->id); glBindBufferARB(GL_ARRAY_BUFFER_ARB, buf->id); glBufferDataARB(GL_ARRAY_BUFFER_ARB, size, NULL, GL_STATIC_DRAW_ARB); @@ -245,9 +245,9 @@ GPUBuffer *GPU_buffer_alloc(int size) buf->pointer = MEM_mallocN(size, "GPUBuffer.pointer"); /* purpose of this seems to be dealing with - out-of-memory errors? looks a bit iffy to me - though, at least on Linux I expect malloc() would - just overcommit. --nicholas */ + * out-of-memory errors? looks a bit iffy to me + * though, at least on Linux I expect malloc() would + * just overcommit. --nicholas */ while (!buf->pointer && pool->totbuf > 0) { gpu_buffer_pool_delete_last(pool); buf->pointer = MEM_mallocN(size, "GPUBuffer.pointer"); @@ -260,8 +260,8 @@ GPUBuffer *GPU_buffer_alloc(int size) } /* release a GPUBuffer; does not free the actual buffer or its data, - but rather moves it to the pool of recently-freed buffers for - possible re-use*/ + * but rather moves it to the pool of recently-freed buffers for + * possible re-use*/ void GPU_buffer_free(GPUBuffer *buffer) { GPUBufferPool *pool; @@ -273,18 +273,18 @@ void GPU_buffer_free(GPUBuffer *buffer) pool = gpu_get_global_buffer_pool(); /* free the last used buffer in the queue if no more space, but only - if we are in the main thread. for e.g. rendering or baking it can - happen that we are in other thread and can't call OpenGL, in that - case cleanup will be done GPU_buffer_pool_free_unused */ + * if we are in the main thread. for e.g. rendering or baking it can + * happen that we are in other thread and can't call OpenGL, in that + * case cleanup will be done GPU_buffer_pool_free_unused */ if (BLI_thread_is_main()) { /* in main thread, safe to decrease size of pool back - down to MAX_FREE_GPU_BUFFERS */ + * down to MAX_FREE_GPU_BUFFERS */ while (pool->totbuf >= MAX_FREE_GPU_BUFFERS) gpu_buffer_pool_delete_last(pool); } else { /* outside of main thread, can't safely delete the - buffer, so increase pool size */ + * buffer, so increase pool size */ if (pool->maxsize == pool->totbuf) { pool->maxsize += MAX_FREE_GPU_BUFFERS; pool->buffers = MEM_reallocN(pool->buffers, @@ -308,7 +308,7 @@ typedef struct GPUVertPointLink { } GPUVertPointLink; /* add a new point to the list of points related to a particular - vertex */ + * vertex */ static void gpu_drawobject_add_vert_point(GPUDrawObject *gdo, int vert_index, int point_index) { GPUVertPointLink *lnk; @@ -329,7 +329,7 @@ static void gpu_drawobject_add_vert_point(GPUDrawObject *gdo, int vert_index, in } /* update the vert_points and triangle_to_mface fields with a new - triangle */ + * triangle */ static void gpu_drawobject_add_triangle(GPUDrawObject *gdo, int base_point_index, int face_index, @@ -342,7 +342,7 @@ static void gpu_drawobject_add_triangle(GPUDrawObject *gdo, } /* for each vertex, build a list of points related to it; these lists - are stored in an array sized to the number of vertices */ + * are stored in an array sized to the number of vertices */ static void gpu_drawobject_init_vert_points(GPUDrawObject *gdo, MFace *f, int totface) { GPUBufferMaterial *mat; @@ -356,7 +356,7 @@ static void gpu_drawobject_init_vert_points(GPUDrawObject *gdo, MFace *f, int to gdo->vert_points_usage = 0; /* build a map from the original material indices to the new - GPUBufferMaterial indices */ + * GPUBufferMaterial indices */ for (i = 0; i < gdo->totmaterial; i++) mat_orig_to_new[gdo->materials[i].mat_nr] = i; @@ -390,7 +390,7 @@ static void gpu_drawobject_init_vert_points(GPUDrawObject *gdo, MFace *f, int to } /* see GPUDrawObject's structure definition for a description of the - data being initialized here */ + * data being initialized here */ GPUDrawObject *GPU_drawobject_new( DerivedMesh *dm ) { GPUDrawObject *gdo; @@ -402,7 +402,7 @@ GPUDrawObject *GPU_drawobject_new( DerivedMesh *dm ) totface= dm->getNumTessFaces(dm); /* get the number of points used by each material, treating - each quad as two triangles */ + * each quad as two triangles */ memset(points_per_mat, 0, sizeof(int)*MAX_MATERIALS); for (i = 0; i < totface; i++) points_per_mat[mface[i].mat_nr] += mface[i].v4 ? 6 : 3; @@ -500,7 +500,7 @@ static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm, GPUDrawObject *object, cur_index_per_mat[i] = object->materials[i].start * vector_size; /* map from original material index to new - GPUBufferMaterial index */ + * GPUBufferMaterial index */ mat_orig_to_new[object->materials[i].mat_nr] = i; } @@ -509,7 +509,7 @@ static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm, GPUDrawObject *object, while (!success) { /* bind the buffer and discard previous data, - avoids stalling gpu */ + * avoids stalling gpu */ glBindBufferARB(target, buffer->id); glBufferDataARB(target, buffer->size, NULL, GL_STATIC_DRAW_ARB); @@ -521,14 +521,14 @@ static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm, GPUDrawObject *object, buffer= NULL; /* try freeing an entry from the pool - and reallocating the buffer */ + * and reallocating the buffer */ if (pool->totbuf > 0) { gpu_buffer_pool_delete_last(pool); buffer = GPU_buffer_alloc(size); } /* allocation still failed; fall back - to legacy mode */ + * to legacy mode */ if (!buffer) { dm->drawObject->legacy = 1; success = 1; @@ -813,7 +813,7 @@ static void GPU_buffer_copy_uvedge(DerivedMesh *dm, float *varray, int *UNUSED(i } /* get the DerivedMesh's MCols; choose (in decreasing order of - preference) from CD_ID_MCOL, CD_PREVIEW_MCOL, or CD_MCOL */ + * preference) from CD_ID_MCOL, CD_PREVIEW_MCOL, or CD_MCOL */ static MCol *gpu_buffer_color_type(DerivedMesh *dm) { MCol *c; @@ -932,7 +932,7 @@ static GPUBuffer *gpu_buffer_setup_type(DerivedMesh *dm, GPUBufferType type) } /* get the buffer of `type', initializing the GPUDrawObject and - buffer if needed */ + * buffer if needed */ static GPUBuffer *gpu_buffer_setup_common(DerivedMesh *dm, GPUBufferType type) { GPUBuffer **buf; @@ -1189,7 +1189,7 @@ void GPU_color_switch(int mode) } /* return 1 if drawing should be done using old immediate-mode - code, 0 otherwise */ + * code, 0 otherwise */ int GPU_buffer_legacy(DerivedMesh *dm) { int test= (U.gameflags & USER_DISABLE_VBO); @@ -1242,7 +1242,7 @@ void GPU_buffer_unlock(GPUBuffer *buffer) if (useVBOs) { if (buffer) { /* note: this operation can fail, could return - an error code from this function? */ + * an error code from this function? */ glUnmapBufferARB(GL_ARRAY_BUFFER_ARB); } glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0); @@ -1260,7 +1260,7 @@ void GPU_buffer_draw_elements(GPUBuffer *elements, unsigned int mode, int start, /* XXX: the rest of the code in this file is used for optimized PBVH - drawing and doesn't interact at all with the buffer code above */ + * drawing and doesn't interact at all with the buffer code above */ /* Convenience struct for building the VBO. */ typedef struct { @@ -1426,8 +1426,8 @@ void GPU_update_grid_buffers(GPU_Buffers *buffers, DMGridData **grids, if (!smooth) { /* for flat shading, recalc normals and set the last vertex of - each quad in the index buffer to have the flat normal as - that is what opengl will use */ + * each quad in the index buffer to have the flat normal as + * that is what opengl will use */ for (j = 0; j < gridsize-1; ++j) { for (k = 0; k < gridsize-1; ++k) { float fno[3]; @@ -1471,7 +1471,7 @@ static int gpu_count_grid_quads(BLI_bitmap *grid_hidden, int i, x, y, totquad; /* grid hidden layer is present, so have to check each grid for - visiblity */ + * visiblity */ for (i = 0, totquad = 0; i < totgrid; i++) { const BLI_bitmap gh = grid_hidden[grid_indices[i]]; @@ -1493,7 +1493,7 @@ static int gpu_count_grid_quads(BLI_bitmap *grid_hidden, } /* Build the element array buffer of grid indices using either - unsigned shorts or unsigned ints. */ + * unsigned shorts or unsigned ints. */ #define FILL_QUAD_BUFFER(type_, tot_quad_, buffer_) \ { \ type_ *quad_data; \ @@ -1552,7 +1552,7 @@ static GLuint gpu_get_grid_buffer(int gridsize, GLenum *index_type, unsigned *to int totgrid = 1; /* VBO is disabled; delete the previous buffer (if it exists) and - return an invalid handle */ + * return an invalid handle */ if (!GLEW_ARB_vertex_buffer_object || (U.gameflags & USER_DISABLE_VBO)) { if (buffer) glDeleteBuffersARB(1, &buffer); diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index a40452adfe7..fc3878e2532 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -388,7 +388,7 @@ static void codegen_set_unique_ids(ListBase *nodes) ((input->source == GPU_SOURCE_TEX) || (input->source == GPU_SOURCE_TEX_PIXEL))) { if (input->link) { /* input is texture from buffer, assign only one texid per - buffer to avoid sampling the same texture twice */ + * buffer to avoid sampling the same texture twice */ if (!BLI_ghash_haskey(bindhash, input->link)) { input->texid = texid++; input->bindtex = 1; @@ -399,7 +399,7 @@ static void codegen_set_unique_ids(ListBase *nodes) } else if (input->ima) { /* input is texture from image, assign only one texid per - buffer to avoid sampling the same texture twice */ + * buffer to avoid sampling the same texture twice */ if (!BLI_ghash_haskey(bindhash, input->ima)) { input->texid = texid++; input->bindtex = 1; @@ -968,8 +968,8 @@ static void GPU_node_output(GPUNode *node, int type, const char *UNUSED(name), G output->link->output = output; /* note: the caller owns the reference to the linkfer, GPUOutput - merely points to it, and if the node is destroyed it will - set that pointer to NULL */ + * merely points to it, and if the node is destroyed it will + * set that pointer to NULL */ } BLI_addtail(&node->outputs, output); diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index e50f8e16ea5..b566d975f5b 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -300,7 +300,7 @@ int IMB_indexer_can_scan(struct anim_index * idx, int old_frame_index, int new_frame_index) { /* makes only sense, if it is the same I-Frame and we are not - trying to run backwards in time... */ + * trying to run backwards in time... */ return (IMB_indexer_get_seek_pos(idx, old_frame_index) == IMB_indexer_get_seek_pos(idx, new_frame_index) && old_frame_index < new_frame_index); diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 7aa37b547f4..3168e5b765a 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -91,9 +91,9 @@ typedef struct Strip { struct Strip *next, *prev; int us, done; int startstill, endstill; - StripElem *stripdata; /* only used as an array in IMAGE sequences(!), - and as a 1-element array in MOVIE sequences, - NULL for all other strip-types */ + StripElem *stripdata; /* only used as an array in IMAGE sequences(!), + * and as a 1-element array in MOVIE sequences, + * NULL for all other strip-types */ char dir[768]; StripProxy *proxy; StripCrop *crop; diff --git a/source/blender/makesrna/intern/rna_actuator.c b/source/blender/makesrna/intern/rna_actuator.c index c24b78a155c..e564c03df14 100644 --- a/source/blender/makesrna/intern/rna_actuator.c +++ b/source/blender/makesrna/intern/rna_actuator.c @@ -322,7 +322,7 @@ static void rna_ConstraintActuator_spring_set(struct PointerRNA *ptr, float valu *fp = value; } /* ConstraintActuator uses the same property for Material and Property. - Therefore we need to clear the property when "use_material_detect" mode changes */ + * Therefore we need to clear the property when "use_material_detect" mode changes */ static void rna_Actuator_constraint_detect_material_set(struct PointerRNA *ptr, int value) { bActuator *act = (bActuator*)ptr->data; @@ -1453,19 +1453,19 @@ static void rna_def_scene_actuator(BlenderRNA *brna) RNA_def_property_update(prop, NC_LOGIC, NULL); /* XXX no need for those tooltips. to remove soon - Originally we had different 'scene' tooltips for different values of 'type'. - They were: - ACT_SCENE_RESTART "" - ACT_SCENE_CAMERA "" - ACT_SCENE_SET "Set this Scene" - ACT_SCENE_ADD_FRONT "Add an Overlay Scene" - ACT_SCENE_ADD_BACK "Add a Background Scene" - ACT_SCENE_REMOVE "Remove a Scene" - ACT_SCENE_SUSPEND "Pause a Scene" - ACT_SCENE_RESUME "Unpause a Scene" - - It can be done in the ui script if still needed. - */ + * Originally we had different 'scene' tooltips for different values of 'type'. + * They were: + * ACT_SCENE_RESTART "" + * ACT_SCENE_CAMERA "" + * ACT_SCENE_SET "Set this Scene" + * ACT_SCENE_ADD_FRONT "Add an Overlay Scene" + * ACT_SCENE_ADD_BACK "Add a Background Scene" + * ACT_SCENE_REMOVE "Remove a Scene" + * ACT_SCENE_SUSPEND "Pause a Scene" + * ACT_SCENE_RESUME "Unpause a Scene" + * + * It can be done in the ui script if still needed. + */ } diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 0b80f4ab893..5093c1a6eee 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -927,7 +927,7 @@ static void rna_def_operator_stroke_element(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Is Stroke Start", ""); /* XXX: Tool (this will be for pressing a modifier key for a different brush, - e.g. switching to a Smooth brush in the middle of the stroke */ + * e.g. switching to a Smooth brush in the middle of the stroke */ /* XXX: i don't think blender currently supports the ability to properly do a remappable modifier * in the middle of a stroke */ diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 128c2609df9..5bf52c0d552 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1200,13 +1200,13 @@ static void rna_def_curve_spline_bezpoints(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_flag(func, FUNC_USE_SELF_ID|FUNC_USE_REPORTS); RNA_def_int(func, "count", 1, INT_MIN, INT_MAX, "Number", "Number of points to add to the spline", 0, INT_MAX); - /* +#if 0 func= RNA_def_function(srna, "remove", "rna_Curve_spline_remove"); RNA_def_function_ui_description(func, "Remove a spline from a curve"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm= RNA_def_pointer(func, "spline", "Spline", "", "The spline to remove"); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL); - */ +#endif } /* curve.splines */ @@ -1449,13 +1449,14 @@ static void rna_def_curve(BlenderRNA *brna) RNA_def_property_float_funcs(prop, "rna_Curve_texspace_size_get", "rna_Curve_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - /* not supported yet + /* not supported yet */ +#if 0 prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER); RNA_def_property_float(prop, NULL, "rot"); RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation"); RNA_def_property_editable_func(prop, texspace_editable); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - */ +#endif prop = RNA_def_property(srna, "use_uv_as_generated", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_UV_ORCO); diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 792635ba5ae..e5939296f5a 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -189,11 +189,11 @@ static void rna_Image_file_format_set(PointerRNA *ptr, int value) ImBuf *ibuf; int ftype = BKE_imtype_to_ftype(value); - /* +#if 0 ibuf= BKE_image_get_ibuf(image, NULL); if (ibuf) ibuf->ftype= ftype; - */ +#endif /* to be safe change all buffer file types */ for (ibuf = image->ibufs.first; ibuf; ibuf = ibuf->next) { @@ -603,9 +603,9 @@ static void rna_def_image(BlenderRNA *brna) RNA_def_property_update(prop, NC_IMAGE|ND_DISPLAY, NULL); /* - Image.has_data and Image.depth are temporary, - Update import_obj.py when they are replaced (Arystan) - */ + * Image.has_data and Image.depth are temporary, + * Update import_obj.py when they are replaced (Arystan) + */ prop = RNA_def_property(srna, "has_data", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_Image_has_data_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 245346326ae..94120c8edc6 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -267,7 +267,8 @@ static void rna_ShapeKeyBezierPoint_handle_2_co_set(PointerRNA *ptr, const float vec[6+2] = values[2]; } -/*static float rna_ShapeKeyBezierPoint_tilt_get(PointerRNA *ptr) +#if 0 +static float rna_ShapeKeyBezierPoint_tilt_get(PointerRNA *ptr) { float *vec= (float*)ptr->data; return vec[10]; @@ -277,7 +278,8 @@ static void rna_ShapeKeyBezierPoint_tilt_set(PointerRNA *ptr, float value) { float *vec= (float*)ptr->data; vec[10]= value; -}*/ +} +#endif static void rna_ShapeKey_data_begin(CollectionPropertyIterator *iter, PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 92e65f26100..a0d3cdef9eb 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -606,21 +606,18 @@ static int rna_Main_gpencil_is_updated_get(PointerRNA *ptr) { return DAG_id_type void RNA_api_main(StructRNA *srna) { - /* +#if 0 FunctionRNA *func; PropertyRNA *parm; - */ /* maybe we want to add functions in 'bpy.data' still? * for now they are all in collections bpy.data.images.new(...) */ - /* func= RNA_def_function(srna, "add_image", "rna_Main_add_image"); RNA_def_function_ui_description(func, "Add a new image"); parm= RNA_def_string_file_path(func, "filepath", "", 0, "", "File path to load image from"); RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_pointer(func, "image", "Image", "", "New image"); RNA_def_function_return(func, parm); - */ - +#endif } void RNA_def_main_cameras(BlenderRNA *brna, PropertyRNA *cprop) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index d6c240b29c1..78f62194735 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1,4 +1,4 @@ -/** +/* * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or @@ -20,9 +20,9 @@ * ***** END GPL LICENSE BLOCK ***** */ -/*note: the original vertex color stuff is now just used for - getting info on the layers themselves, accessing the data is - done through the (not yet written) mpoly interfaces.*/ +/* note: the original vertex color stuff is now just used for + * getting info on the layers themselves, accessing the data is + * done through the (not yet written) mpoly interfaces.*/ /** \file blender/makesrna/intern/rna_mesh.c * \ingroup RNA diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 5fb432c9e8f..e8ea19a5c5b 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -331,13 +331,14 @@ static void rna_def_metaball(BlenderRNA *brna) RNA_def_property_float_funcs(prop, "rna_Meta_texspace_size_get", "rna_Meta_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); - /* not supported yet + /* not supported yet */ +#if 0 prop= RNA_def_property(srna, "texspace_rot", PROP_FLOAT, PROP_EULER); RNA_def_property_float(prop, NULL, "rot"); RNA_def_property_ui_text(prop, "Texture Space Rotation", "Texture space rotation"); RNA_def_property_editable_func(prop, "rna_Meta_texspace_editable"); RNA_def_property_update(prop, 0, "rna_MetaBall_update_data"); - */ +#endif /* materials */ prop = RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index f5bded42a1c..a101bcaec12 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1711,14 +1711,14 @@ static void def_cmp_image(StructRNA *srna) { PropertyRNA *prop; - /* - static EnumPropertyItem type_items[] = { +#if 0 + static EnumPropertyItem type_items[] = { {IMA_SRC_FILE, "IMAGE", 0, "Image", ""}, {IMA_SRC_MOVIE, "MOVIE", "Movie", ""}, {IMA_SRC_SEQUENCE, "SEQUENCE", "Sequence", ""}, {IMA_SRC_GENERATED, "GENERATED", "Generated", ""}, {0, NULL, 0, NULL, NULL}}; - */ +#endif prop = RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "id"); @@ -2873,13 +2873,14 @@ static void def_tex_image(StructRNA *srna) RNA_def_property_ui_text(prop, "Image", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - /* is this supposed to be exposed? not sure.. + /* is this supposed to be exposed? not sure.. */ +#if 0 prop = RNA_def_property(srna, "settings", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "storage"); RNA_def_property_struct_type(prop, "ImageUser"); RNA_def_property_ui_text(prop, "Settings", ""); RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update"); - */ +#endif } static void def_tex_bricks(StructRNA *srna) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 410756ff5ea..d2eef1cdd43 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1780,7 +1780,7 @@ static void rna_def_unified_paint_settings(BlenderRNA *brna) "Instead of per-brush strength, the strength is shared across brushes"); /* unified paint settings that override the equivalent settings - from the active brush */ + * from the active brush */ prop = RNA_def_property(srna, "size", PROP_INT, PROP_DISTANCE); RNA_def_property_int_funcs(prop, NULL, "rna_UnifiedPaintSettings_size_set", NULL); RNA_def_property_range(prop, 1, MAX_BRUSH_PIXEL_RADIUS*10); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 26dfe3c9a4f..fab80997d08 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1237,8 +1237,8 @@ static void rna_def_texture_image(BlenderRNA *brna) #if 0 /* XXX: did this as an array, but needs better descriptions than "1 2 3 4" - perhaps a new subtype could be added? - --I actually used single values for this, maybe change later with a RNA_Rect thing? */ + * perhaps a new subtype could be added? + * --I actually used single values for this, maybe change later with a RNA_Rect thing? */ prop = RNA_def_property(srna, "crop_rectangle", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "cropxmin"); RNA_def_property_array(prop, 4); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 8d331670135..c3a46c39643 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -168,8 +168,8 @@ void rna_trackingTrack_name_set(PointerRNA *ptr, const char *value) BLI_strncpy(track->name, value, sizeof(track->name)); /* TODO: it's a bit difficult to find list track came from knowing just - movie clip ID and MovieTracking structure, so keep this naive - search for a while */ + * movie clip ID and MovieTracking structure, so keep this naive + * search for a while */ if (BLI_findindex(tracksbase, track) < 0) { MovieTrackingObject *object = tracking->objects.first; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index e65f59144af..2b62b459b6e 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -482,14 +482,15 @@ static void rna_def_userdef_theme_ui_style(BlenderRNA *brna) RNA_def_property_struct_type(prop, "ThemeFontStyle"); RNA_def_property_ui_text(prop, "Panel Style", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); -/* (not used yet) + /* (not used yet) */ +#if 0 prop= RNA_def_property(srna, "group_label", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "grouplabel"); RNA_def_property_struct_type(prop, "ThemeFontStyle"); RNA_def_property_ui_text(prop, "Group Label Font", ""); RNA_def_property_update(prop, 0, "rna_userdef_update"); -*/ +#endif prop = RNA_def_property(srna, "widget_label", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "widgetlabel"); diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index b2a25086af9..1fe4f92e124 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -425,7 +425,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, int first_geom_bytes = sizeof(BMVert*) * geom_slot->len; /* make a copy of the initial geometry ordering so the - last duplicate can be merged into it */ + * last duplicate can be merged into it */ first_geom = MEM_mallocN(first_geom_bytes, "first_geom"); memcpy(first_geom, geom_slot->data.buf, first_geom_bytes); } @@ -464,7 +464,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, } /* already copied earlier, but after executation more slot - memory may be allocated */ + * memory may be allocated */ if (j == 0) first_dupe_op = dupe_op; @@ -526,7 +526,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, /* Update normals in case offset object has rotation. */ /* BMESH_TODO: check if normal recalc needed under any other - conditions? */ + * conditions? */ CDDM_calc_normals(result); } diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index d2ec5ee032b..362ed59a38e 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -138,7 +138,7 @@ bNode *node_group_make_from_selected(bNodeTree *ntree) if (totnode==0) return NULL; /* check if all connections are OK, no unselected node has both - inputs and outputs to a selection */ + * inputs and outputs to a selection */ for (link= ntree->links.first; link; link= link->next) { if (link->fromnode && link->tonode && link->fromnode->flag & NODE_SELECT) link->tonode->done |= 1; diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 074f03654bc..d638a3edf30 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -99,8 +99,8 @@ static double bpy_timer_run_tot; /* accumulate python runs */ void bpy_context_update(bContext *C) { /* don't do this from a non-main (e.g. render) thread, it can cause a race - condition on C->data.recursion. ideal solution would be to disable - context entirely from non-main threads, but that's more complicated */ + * condition on C->data.recursion. ideal solution would be to disable + * context entirely from non-main threads, but that's more complicated */ if (!BLI_thread_is_main()) return; diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index f7f1efd63dc..ba8fd40db61 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -4061,7 +4061,7 @@ static void set_phong_threshold(ObjectRen *obr) /* Added check for 'pointy' situations, only dotproducts of 0.9 and larger * are taken into account. This threshold is meant to work on smooth geometry, not - / for extreme cases (ton) */ + * for extreme cases (ton) */ for (i=0; i<obr->totvlak; i++) { vlr= RE_findOrAddVlak(obr, i); @@ -4304,8 +4304,8 @@ static void finalize_render_object(Render *re, ObjectRen *obr, int timeoffset) if (obr->totvert || obr->totvlak || obr->tothalo || obr->totstrand) { /* the exception below is because displace code now is in init_render_mesh call, - I will look at means to have autosmooth enabled for all object types - and have it as general postprocess, like displace */ + * I will look at means to have autosmooth enabled for all object types + * and have it as general postprocess, like displace */ if (ob->type!=OB_MESH && test_for_displace(re, ob)) do_displacement(re, obr, NULL, NULL); @@ -4790,8 +4790,8 @@ static void dupli_render_particle_set(Render *re, Object *ob, int timeoffset, in if (enable) { /* this is to make sure we get render level duplis in groups: - * the derivedmesh must be created before init_render_mesh, - * since object_duplilist does dupliparticles before that */ + * the derivedmesh must be created before init_render_mesh, + * since object_duplilist does dupliparticles before that */ dm = mesh_create_derived_render(re->scene, ob, CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL); dm->release(dm); @@ -4866,7 +4866,7 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp * empty in a dupli group. We could scan all render material/lamp/world * mtex's for mapto objects but its easier just to set the * 'imat' / 'imat_ren' on all and unlikely to be a performance hit - * See bug: [#28744] - campbell */ + * See bug: [#28744] - campbell */ for (ob= re->main->object.first; ob; ob= ob->id.next) { /* imat objects has to be done here, since displace can have texture using Object map-input */ mult_m4_m4m4(mat, re->viewmat, ob->obmat); @@ -5460,8 +5460,8 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float * /* (bad) HACK calculate average velocity */ /* better solution would be fixing getVelocityAt() in intern/elbeem/intern/solver_util.cpp - so that also small drops/little water volumes return a velocity != 0. - But I had no luck in fixing that function - DG */ + * so that also small drops/little water volumes return a velocity != 0. + * But I had no luck in fixing that function - DG */ for (a=0; a<obr->totvert; a++) { for (j=0;j<3;j++) avgvel[j] += velarray[a].vel[j]; diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 247eadbb698..48002029e56 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -61,7 +61,7 @@ #include "wm_event_types.h" /******************************* Keymap Item ********************************** -* Item in a keymap, that maps from an event to an operator or modal map item */ + * Item in a keymap, that maps from an event to an operator or modal map item */ static wmKeyMapItem *wm_keymap_item_copy(wmKeyMapItem *kmi) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 70feccad94a..6f140b5c8b6 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -952,7 +952,7 @@ static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op) uiBlockSetFlag(block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_RET_1 | UI_BLOCK_MOVEMOUSE_QUIT); /* if register is not enabled, the operator gets freed on OPERATOR_FINISHED - * ui_apply_but_funcs_after calls ED_undo_operator_repeate_cb and crashes */ + * ui_apply_but_funcs_after calls ED_undo_operator_repeate_cb and crashes */ assert(op->type->flag & OPTYPE_REGISTER); uiBlockSetHandleFunc(block, ED_undo_operator_repeat_cb_evt, arg_op); |