diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-03-04 00:19:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-04 00:19:11 +0400 |
| commit | 95670e03a01d30cda5a0f685974f28790be6809d (patch) | |
| tree | e6d5756cbe51edb083cda2fceff087bda35c361a /source/blender/blenkernel/intern | |
| parent | a2c182e9233333fc3b8ff40d352113ec95e7e30c (diff) | |
style cleanup / comment formatting for bli/bke/bmesh
Diffstat (limited to 'source/blender/blenkernel/intern')
51 files changed, 494 insertions, 499 deletions
diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index f843d21a975..c6adc3ea494 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -2468,7 +2468,7 @@ CCGError ccgSubSurf_updateToFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, } /* stitch together face grids, averaging coordinates at edges - and vertices, for multires displacements */ + * and vertices, for multires displacements */ CCGError ccgSubSurf_stitchFaces(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF) { CCGVert **effectedV; @@ -2634,8 +2634,8 @@ CCGError ccgSubSurf_updateNormals(CCGSubSurf *ss, CCGFace **effectedF, int numEf } /* compute subdivision levels from a given starting point, used by - multires subdivide/propagate, by filling in coordinates at a - certain level, and then subdividing that up to the highest level */ + * multires subdivide/propagate, by filling in coordinates at a + * certain level, and then subdividing that up to the highest level */ CCGError ccgSubSurf_updateLevels(CCGSubSurf *ss, int lvl, CCGFace **effectedF, int numEffectedF) { CCGVert **effectedV; diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index c181548eb19..b1b98c030eb 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -65,17 +65,17 @@ #include "RNA_access.h" /* *********************** NOTE ON POSE AND ACTION ********************** - - - Pose is the local (object level) component of armature. The current - object pose is saved in files, and (will be) is presorted for dependency - - Actions have fewer (or other) channels, and write data to a Pose - - Currently ob->pose data is controlled in where_is_pose only. The (recalc) - event system takes care of calling that - - The NLA system (here too) uses Poses as interpolation format for Actions - - Therefore we assume poses to be static, and duplicates of poses have channels in - same order, for quick interpolation reasons - - ****************************** (ton) ************************************ */ + * + * - Pose is the local (object level) component of armature. The current + * object pose is saved in files, and (will be) is presorted for dependency + * - Actions have fewer (or other) channels, and write data to a Pose + * - Currently ob->pose data is controlled in where_is_pose only. The (recalc) + * event system takes care of calling that + * - The NLA system (here too) uses Poses as interpolation format for Actions + * - Therefore we assume poses to be static, and duplicates of poses have channels in + * same order, for quick interpolation reasons + * + * ****************************** (ton) ************************************ */ /* ***************** Library data level operations on action ************** */ @@ -1214,23 +1214,22 @@ static void blend_pose_strides(bPose *dst, bPose *src, float srcweight, short mo } -/* - -bone matching diagram, strips A and B - - .------------------------. - | A | - '------------------------' - . . b2 - . .-------------v----------. - . | B . | - . '------------------------' - . . . - . . . -offset: . 0 . A-B . A-b2+B - . . . - -*/ +/* + * bone matching diagram, strips A and B + * + * .------------------------. + * | A | + * '------------------------' + * . . b2 + * . .-------------v----------. + * . | B . | + * . '------------------------' + * . . . + * . . . + * offset: . 0 . A-B . A-b2+B + * . . . + * + * */ static void blend_pose_offset_bone(bActionStrip *strip, bPose *dst, bPose *src, float srcweight, short mode) @@ -1294,8 +1293,8 @@ static void blend_pose_offset_bone(bActionStrip *strip, bPose *dst, bPose *src, } /* added "sizecorr" here, to allow armatures to be scaled and still have striding. - Only works for uniform scaling. In general I'd advise against scaling armatures ever though! (ton) -*/ + * Only works for uniform scaling. In general I'd advise against scaling armatures ever though! (ton) + */ static float stridechannel_frame(Object *ob, float sizecorr, bActionStrip *strip, Path *path, float pathdist, float *stride_offset) { bAction *act= strip->act; diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index a9b58ea1f99..743cfba0185 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -955,8 +955,8 @@ static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, fl /* par_space_mat - only used for groups so we can modify the space dupli's are in - when par_space_mat is NULL ob->obmat can be used instead of ob__obmat - */ + * when par_space_mat is NULL ob->obmat can be used instead of ob__obmat + */ if(par_space_mat) mult_m4_m4m4(vdd.obmat, par_space_mat, ob->obmat); else @@ -1085,8 +1085,8 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa /* End Scene/Group object loop, below is generic */ /* par_space_mat - only used for groups so we can modify the space dupli's are in - when par_space_mat is NULL ob->obmat can be used instead of ob__obmat - */ + * when par_space_mat is NULL ob->obmat can be used instead of ob__obmat + */ if(par_space_mat) mult_m4_m4m4(ob__obmat, par_space_mat, ob->obmat); else @@ -1117,11 +1117,11 @@ static void face_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par, floa v1= mvert[(mv1= loopstart[0].v)].co; v2= mvert[(mv2= loopstart[1].v)].co; v3= mvert[(mv3= loopstart[2].v)].co; - /* +#if 0 if (mp->totloop > 3) { v4= mvert[(mv4= loopstart[3].v)].co; } - */ +#endif } /* translation */ @@ -1626,8 +1626,8 @@ void free_object_duplilist(ListBase *lb) DupliObject *dob; /* loop in reverse order, if object is instanced multiple times - the original layer may not really be original otherwise, proper - solution is more complicated */ + * the original layer may not really be original otherwise, proper + * solution is more complicated */ for(dob= lb->last; dob; dob= dob->prev) { dob->ob->lay= dob->origlay; copy_m4_m4(dob->ob->obmat, dob->omat); diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 4ac1f126c35..cb54e9158dd 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1191,8 +1191,8 @@ static short animsys_write_rna_setting (PointerRNA *ptr, char *path, int array_i #endif /* as long as we don't do property update, we still tag datablock - as having been updated. this flag does not cause any updates to - be run, it's for e.g. render engines to synchronize data */ + * as having been updated. this flag does not cause any updates to + * be run, it's for e.g. render engines to synchronize data */ if(new_ptr.id.data) { ID *id= new_ptr.id.data; id->flag |= LIB_ID_RECALC; diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index bc18332844b..263e90b6559 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1584,7 +1584,7 @@ void where_is_armature_bone(Bone *bone, Bone *prevbone) } /* updates vectors and matrices on rest-position level, only needed - after editing armature itself, now only on reading file */ + * after editing armature itself, now only on reading file */ void where_is_armature(bArmature *arm) { Bone *bone; diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 9e706c48430..c178bf6f0a7 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -201,7 +201,7 @@ void make_local_brush(Brush *brush) if(brush->clone.image) { /* special case: ima always local immediately. Clone image should only - have one user anyway. */ + * have one user anyway. */ id_clear_lib_data(bmain, &brush->clone.image->id); extern_local_brush(brush); } @@ -331,10 +331,8 @@ void brush_debug_print_state(Brush *br) void brush_reset_sculpt(Brush *br) { /* enable this to see any non-default - settings used by a brush: - - brush_debug_print_state(br); - */ + * settings used by a brush: */ + // brush_debug_print_state(br); brush_set_defaults(br); brush_curve_preset(br, CURVE_PRESET_SMOOTH); @@ -857,8 +855,8 @@ static void brush_painter_do_partial(BrushPainter *painter, ImBuf *oldtexibuf, dotexold = (oldtexibuf != NULL); /* not sure if it's actually needed or it's a mistake in coords/sizes - calculation in brush_painter_fixed_tex_partial_update(), but without this - limitation memory gets corrupted at fast strokes with quite big spacing (sergey) */ + * calculation in brush_painter_fixed_tex_partial_update(), but without this + * limitation memory gets corrupted at fast strokes with quite big spacing (sergey) */ w = MIN2(w, ibuf->x); h = MIN2(h, ibuf->y); @@ -1049,7 +1047,7 @@ void brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2], floa int use_jitter= brush->jitter != 0; /* jitter-ed brush gives weird and unpredictable result for this - kinds of stroke, so manyally disable jitter usage (sergey) */ + * kinds of stroke, so manyally disable jitter usage (sergey) */ use_jitter &= (brush->flag & (BRUSH_RESTORE_MESH|BRUSH_ANCHORED)) == 0; if (use_jitter) { @@ -1139,7 +1137,7 @@ int brush_painter_paint(BrushPainter *painter, BrushFunc func, const float pos[2 const int radius= brush_size(scene, brush); /* compute brush spacing adapted to brush radius, spacing may depend - on pressure, so update it */ + * on pressure, so update it */ brush_apply_pressure(painter, brush, painter->lastpressure); spacing= MAX2(1.0f, radius)*brush->spacing*0.01f; @@ -1188,8 +1186,8 @@ int brush_painter_paint(BrushPainter *painter, BrushFunc func, const float pos[2 } /* do airbrush paint ops, based on the number of paint ops left over - from regular painting. this is a temporary solution until we have - accurate time stamps for mouse move events */ + * from regular painting. this is a temporary solution until we have + * accurate time stamps for mouse move events */ if (brush->flag & BRUSH_AIRBRUSH) { double curtime= time; double painttime= brush->rate*totpaintops; diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 0af3c9c9f02..8d9333c8aec 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -588,17 +588,17 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float { BMEditMesh *em= data->em_evil; if(em) { - /*data->em_evil is only set for snapping, and only for the mesh of the object - which is currently open in edit mode. When set, the bvhtree should not contain - faces that will interfere with snapping (e.g. faces that are hidden/selected - or faces that have selected verts).*/ + /* data->em_evil is only set for snapping, and only for the mesh of the object + * which is currently open in edit mode. When set, the bvhtree should not contain + * faces that will interfere with snapping (e.g. faces that are hidden/selected + * or faces that have selected verts).*/ /* XXX, for snap only, em & dm are assumed to be aligned, since dm is the em's cage */ - /*Insert BMesh-tessellation triangles into the bvh tree, unless they are hidden - and/or selected. Even if the faces themselves are not selected for the snapped - transform, having a vertex selected means the face (and thus it's tesselated - triangles) will be moving and will not be a good snap targets.*/ + /* Insert BMesh-tessellation triangles into the bvh tree, unless they are hidden + * and/or selected. Even if the faces themselves are not selected for the snapped + * transform, having a vertex selected means the face (and thus it's tesselated + * triangles) will be moving and will not be a good snap targets.*/ for (i = 0; i < em->tottri; i++) { BMLoop **tri = em->looptris[i]; BMFace *f; @@ -606,28 +606,28 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float BMIter iter; int insert; - /*Each loop of the triangle points back to the BMFace it was tesselated from. - All three should point to the same face, so just use the face from the first - loop.*/ + /* Each loop of the triangle points back to the BMFace it was tesselated from. + * All three should point to the same face, so just use the face from the first + * loop.*/ f = tri[0]->f; - /*If the looptris is ordered such that all triangles tesselated from a single - faces are consecutive elements in the array, then we could speed up the tests - below by using the insert value from the previous iteration.*/ + /* If the looptris is ordered such that all triangles tesselated from a single + * faces are consecutive elements in the array, then we could speed up the tests + * below by using the insert value from the previous iteration.*/ /*Start with the assumption the triangle should be included for snapping.*/ insert = 1; if (BM_elem_flag_test(f, BM_ELEM_SELECT) || BM_elem_flag_test(f, BM_ELEM_HIDDEN)) { - /*Don't insert triangles tesselated from faces that are hidden - or selected*/ + /* Don't insert triangles tesselated from faces that are hidden + * or selected*/ insert = 0; } else { BM_ITER(v, &iter, em->bm, BM_VERTS_OF_FACE, f) { if (BM_elem_flag_test(v, BM_ELEM_SELECT)) { - /*Don't insert triangles tesselated from faces that have - any selected verts.*/ + /* Don't insert triangles tesselated from faces that have + * any selected verts.*/ insert = 0; } } @@ -635,8 +635,8 @@ BVHTree* bvhtree_from_mesh_faces(BVHTreeFromMesh *data, DerivedMesh *mesh, float if (insert) { - /*No reason found to block hit-testing the triangle for snap, - so insert it now.*/ + /* No reason found to block hit-testing the triangle for snap, + * so insert it now.*/ float co[4][3]; copy_v3_v3(co[0], tri[0]->v->co); copy_v3_v3(co[1], tri[1]->v->co); diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 108b4e48a95..4f288594dc9 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -386,7 +386,7 @@ static void calchandle_curvemap(BezTriple *bezt, BezTriple *prev, BezTriple *nex } /* in X, out Y. - X is presumed to be outside first or last */ + * X is presumed to be outside first or last */ static float curvemap_calc_extend(CurveMap *cuma, float x, const float first[2], const float last[2]) { if(x <= first[0]) { @@ -454,7 +454,7 @@ static void curvemap_make_table(CurveMap *cuma, rctf *clipr) } /* first and last handle need correction, instead of pointing to center of next/prev, - we let it point to the closest handle */ + * we let it point to the closest handle */ if(cuma->totpoint>2) { float hlen, nlen, vec[3]; diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 931934f8052..5af72e6115c 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1135,13 +1135,13 @@ float *make_orco_surf(Object *ob) nu= cu->nurb.first; while(nu) { /* as we want to avoid the seam in a cyclic nurbs - texture wrapping, reserve extra orco data space to save these extra needed - vertex based UV coordinates for the meridian vertices. - Vertices on the 0/2pi boundary are not duplicated inside the displist but later in - the renderface/vert construction. - - See also convertblender.c: init_render_surf() - */ + * texture wrapping, reserve extra orco data space to save these extra needed + * vertex based UV coordinates for the meridian vertices. + * Vertices on the 0/2pi boundary are not duplicated inside the displist but later in + * the renderface/vert construction. + * + * See also convertblender.c: init_render_surf() + */ resolu= cu->resolu_ren ? cu->resolu_ren : nu->resolu; resolv= cu->resolv_ren ? cu->resolv_ren : nu->resolv; @@ -1505,11 +1505,11 @@ static int cu_isectLL(const float v1[3], const float v2[3], const float v3[3], c float *labda, float *mu, float vec[3]) { /* return: - -1: colliniar - 0: no intersection of segments - 1: exact intersection of segments - 2: cross-intersection of segments - */ + * -1: colliniar + * 0: no intersection of segments + * 1: exact intersection of segments + * 2: cross-intersection of segments + */ float deler; deler= (v1[cox]-v2[cox])*(v3[coy]-v4[coy])-(v3[cox]-v4[cox])*(v1[coy]-v2[coy]); @@ -1572,7 +1572,7 @@ static short bevelinside(BevList *bl1,BevList *bl2) /* there's a transition, calc intersection point */ mode= cu_isectLL(prevbevp->vec, bevp->vec, hvec1, hvec2, 0, 1, &lab, &mu, vec); /* if lab==0.0 or lab==1.0 then the edge intersects exactly a transition - only allow for one situation: we choose lab= 1.0 + * only allow for one situation: we choose lab= 1.0 */ if(mode >= 0 && lab != 0.0f) { if(vec[0]<hvec1[0]) links++; @@ -2075,11 +2075,11 @@ static void make_bevel_list_segment_3D(BevList *bl) void makeBevelList(Object *ob) { /* - - convert all curves to polys, with indication of resol and flags for double-vertices - - possibly; do a smart vertice removal (in case Nurb) - - separate in individual blicks with BoundBox - - AutoHole detection - */ + * - convert all curves to polys, with indication of resol and flags for double-vertices + * - possibly; do a smart vertice removal (in case Nurb) + * - separate in individual blicks with BoundBox + * - AutoHole detection + */ Curve *cu; Nurb *nu; BezTriple *bezt, *prevbezt; @@ -2701,12 +2701,12 @@ void calchandlesNurb(Nurb *nu) /* first, if needed, set handle flags */ void testhandlesNurb(Nurb *nu) { /* use when something has changed with handles. - it treats all BezTriples with the following rules: - PHASE 1: do types have to be altered? - Auto handles: become aligned when selection status is NOT(000 || 111) - Vector handles: become 'nothing' when (one half selected AND other not) - PHASE 2: recalculate handles - */ + * it treats all BezTriples with the following rules: + * PHASE 1: do types have to be altered? + * Auto handles: become aligned when selection status is NOT(000 || 111) + * Vector handles: become 'nothing' when (one half selected AND other not) + * PHASE 2: recalculate handles + */ BezTriple *bezt; short flag, a; diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index cd15c56cea1..2a3d7182770 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -102,10 +102,10 @@ typedef struct LayerTypeInfo { void (*swap)(void *data, const int *corner_indices); /* a function to set a layer's data to default values. if NULL, the - default is assumed to be all zeros */ + * default is assumed to be all zeros */ void (*set_default)(void *data, int count); - /* functions necessary for geometry collapse*/ + /* functions necessary for geometry collapse*/ int (*equal)(void *data1, void *data2); void (*multiply)(void *data, float fac); void (*initminmax)(void *min, void *max); @@ -450,7 +450,7 @@ static void layerSwap_mdisps(void *data, const int *ci) if(corners!=nverts) { /* happens when face changed vertex count in edit mode - if it happened, just forgot displacement */ + * if it happened, just forgot displacement */ MEM_freeN(s->disps); s->totdisp= (s->totdisp/corners)*nverts; @@ -1481,7 +1481,7 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data, void *newlayerdata = NULL; /* Passing a layerdata to copy from with an alloctype that won't copy is - most likely a bug */ + * most likely a bug */ BLI_assert(!layerdata || (alloctype == CD_ASSIGN) || (alloctype == CD_DUPLICATE) || @@ -2307,8 +2307,8 @@ int CustomData_layer_has_math(struct CustomData *data, int layern) return 0; } -/*copies the "value" (e.g. mloopuv uv or mloopcol colors) from one block to - another, while not overwriting anything else (e.g. flags)*/ +/* copies the "value" (e.g. mloopuv uv or mloopcol colors) from one block to + * another, while not overwriting anything else (e.g. flags)*/ void CustomData_data_copy_value(int type, void *source, void *dest) { const LayerTypeInfo *typeInfo = layerType_getInfo(type); @@ -2626,8 +2626,8 @@ void CustomData_validate_layer_name(const CustomData *data, int type, char *name if(index < 0) { /* either no layer was specified, or the layer we want has been - * deleted, so assign the active layer to name - */ + * deleted, so assign the active layer to name + */ index = CustomData_get_active_layer_index(data, type); strcpy(outname, data->layers[index].name); } diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index 75898018a2b..4386132fc18 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -109,13 +109,15 @@ static int cdf_endian(void) return CDF_ENDIAN_BIG; } -/*static int cdf_data_type_size(int datatype) +#if 0 +static int cdf_data_type_size(int datatype) { if(datatype == CDF_DATA_FLOAT) return sizeof(float); return 0; -}*/ +} +#endif CDataFile *cdf_create(int type) { diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 83d64f693e2..9e4762a2dbe 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -4763,8 +4763,8 @@ static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, Scene *sc } /* -* Do Dynamic Paint step. Paints scene brush objects of current state/frame to the surface. -*/ + * Do Dynamic Paint step. Paints scene brush objects of current state/frame to the surface. + */ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *surface, float timescale, float subframe) { PaintSurfaceData *sData = surface->data; @@ -4775,8 +4775,8 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su dynamicPaint_surfacePreStep(surface, timescale); /* - * Loop through surface's target paint objects and do painting - */ + * Loop through surface's target paint objects and do painting + */ { Base *base = NULL; GroupObject *go = NULL; @@ -4924,8 +4924,8 @@ static int dynamicPaint_doStep(Scene *scene, Object *ob, DynamicPaintSurface *su } /* -* Calculate a single frame and included subframes for surface -*/ + * Calculate a single frame and included subframes for surface + */ int dynamicPaint_calculateFrame(DynamicPaintSurface *surface, Scene *scene, Object *cObject, int frame) { float timescale = 1.0f; diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 139f7d55438..0080367d9d0 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -90,13 +90,13 @@ BMEditMesh *BMEdit_Copy(BMEditMesh *tm) tm2->bm = BM_mesh_copy(tm->bm); - /*The tessellation is NOT calculated on the copy here, - because currently all the callers of this function use - it to make a backup copy of the BMEditMesh to restore - it in the case of errors in an operation. For perf - reasons, in that case it makes more sense to do the - tessellation only when/if that copy ends up getting - used.*/ + /* The tessellation is NOT calculated on the copy here, + * because currently all the callers of this function use + * it to make a backup copy of the BMEditMesh to restore + * it in the case of errors in an operation. For perf + * reasons, in that case it makes more sense to do the + * tessellation only when/if that copy ends up getting + * used.*/ tm2->looptris = NULL; tm2->vert_index = NULL; @@ -311,18 +311,18 @@ void BMEdit_Free(BMEditMesh *em) } /* -ok, basic design: - -the bmesh derivedmesh exposes the mesh as triangles. it stores pointers -to three loops per triangle. the derivedmesh stores a cache of tessellations -for each face. this cache will smartly update as needed (though at first -it'll simply be more brute force). keeping track of face/edge counts may -be a small problbm. - -this won't be the most efficient thing, considering that internal edges and -faces of tessellations are exposed. looking up an edge by index in particular -is likely to be a little slow. -*/ + * ok, basic design: + * + * the bmesh derivedmesh exposes the mesh as triangles. it stores pointers + * to three loops per triangle. the derivedmesh stores a cache of tessellations + * for each face. this cache will smartly update as needed (though at first + * it'll simply be more brute force). keeping track of face/edge counts may + * be a small problbm. + * + * this won't be the most efficient thing, considering that internal edges and + * faces of tessellations are exposed. looking up an edge by index in particular + * is likely to be a little slow. + */ typedef struct EditDerivedBMesh { DerivedMesh dm; @@ -342,7 +342,7 @@ typedef struct EditDerivedBMesh { static void emDM_calcNormals(DerivedMesh *UNUSED(dm)) { /* Nothing to do: normals are already calculated and stored on the - BMVerts and BMFaces */ + * BMVerts and BMFaces */ } static void emDM_recalcTessellation(DerivedMesh *UNUSED(dm)) @@ -1511,8 +1511,8 @@ static void *emDM_getTessFaceDataArray(DerivedMesh *dm, int type) data = datalayer = DM_get_tessface_data_layer(dm, type); for (i=0; i<bmdm->tc->tottri; i++, data+=size) { efa = bmdm->tc->looptris[i][0]->f; - /*BMESH_TODO: need to still add tface data, - derived from the loops.*/ + /* BMESH_TODO: need to still add tface data, + * derived from the loops.*/ bmdata = CustomData_bmesh_get(&bm->pdata, efa->head.data, type); memcpy(data, bmdata, size); } diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 82a5d9aba3a..21c798c3cae 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -717,11 +717,11 @@ static void get_effector_tot(EffectorCache *eff, EffectorData *efd, EffectedPoin if(eff->pd->forcefield == PFIELD_CHARGE) { /* Only the charge of the effected particle is used for - interaction, not fall-offs. If the fall-offs aren't the - same this will be unphysical, but for animation this - could be the wanted behavior. If you want physical - correctness the fall-off should be spherical 2.0 anyways. - */ + * interaction, not fall-offs. If the fall-offs aren't the + * same this will be unphysical, but for animation this + * could be the wanted behavior. If you want physical + * correctness the fall-off should be spherical 2.0 anyways. + */ efd->charge = eff->pd->f_strength; } else if(eff->pd->forcefield == PFIELD_HARMONIC && (eff->pd->flag & PFIELD_MULTIPLE_SPRINGS)==0) { @@ -943,34 +943,33 @@ static void do_physical_effector(EffectorCache *eff, EffectorData *efd, Effected } /* -------- pdDoEffectors() -------- - generic force/speed system, now used for particles and softbodies - scene = scene where it runs in, for time and stuff - lb = listbase with objects that take part in effecting - opco = global coord, as input - force = force accumulator - speed = actual current speed which can be altered - cur_time = "external" time in frames, is constant for static particles - loc_time = "local" time in frames, range <0-1> for the lifetime of particle - par_layer = layer the caller is in - flags = only used for softbody wind now - guide = old speed of particle - -*/ + * generic force/speed system, now used for particles and softbodies + * scene = scene where it runs in, for time and stuff + * lb = listbase with objects that take part in effecting + * opco = global coord, as input + * force = force accumulator + * speed = actual current speed which can be altered + * cur_time = "external" time in frames, is constant for static particles + * loc_time = "local" time in frames, range <0-1> for the lifetime of particle + * par_layer = layer the caller is in + * flags = only used for softbody wind now + * guide = old speed of particle + */ void pdDoEffectors(ListBase *effectors, ListBase *colliders, EffectorWeights *weights, EffectedPoint *point, float *force, float *impulse) { /* - Modifies the force on a particle according to its - relation with the effector object - Different kind of effectors include: - Forcefields: Gravity-like attractor - (force power is related to the inverse of distance to the power of a falloff value) - Vortex fields: swirling effectors - (particles rotate around Z-axis of the object. otherwise, same relation as) - (Forcefields, but this is not done through a force/acceleration) - Guide: particles on a path - (particles are guided along a curve bezier or old nurbs) - (is independent of other effectors) -*/ + * Modifies the force on a particle according to its + * relation with the effector object + * Different kind of effectors include: + * Forcefields: Gravity-like attractor + * (force power is related to the inverse of distance to the power of a falloff value) + * Vortex fields: swirling effectors + * (particles rotate around Z-axis of the object. otherwise, same relation as) + * (Forcefields, but this is not done through a force/acceleration) + * Guide: particles on a path + * (particles are guided along a curve bezier or old nurbs) + * (is independent of other effectors) + */ EffectorCache *eff; EffectorData efd; int p=0, tot = 1, step = 1; diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 1c6c229d8fc..3efcd3d8dcf 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -827,7 +827,7 @@ void calchandles_fcurve (FCurve *fcu) * -> Auto handles: become aligned when selection status is NOT(000 || 111) * -> Vector handles: become 'nothing' when (one half selected AND other not) * - PHASE 2: recalculate handles -*/ + */ void testhandles_fcurve (FCurve *fcu, const short use_handle) { BezTriple *bezt; @@ -1686,7 +1686,7 @@ static float evaluate_driver (ChannelDriver *driver, const float evaltime) /* The total length of the handles is not allowed to be more * than the horizontal distance between (v1-v4). * This is to prevent curve loops. -*/ + */ void correct_bezpart(float v1[2], float v2[2], float v3[2], float v4[2]) { float h1[2], h2[2], len1, len2, len, fac; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 5a37a65ddbf..ba23b2123d6 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -372,7 +372,7 @@ static void buildchar(Main *bmain, Curve *cu, unsigned long character, CharInfo vfd= vfont_get_data(bmain, which_vfont(cu, info)); if (!vfd) return; - /* +#if 0 if (cu->selend < cu->selstart) { if ((charidx >= (cu->selend)) && (charidx <= (cu->selstart-2))) sel= 1; @@ -381,7 +381,7 @@ static void buildchar(Main *bmain, Curve *cu, unsigned long character, CharInfo if ((charidx >= (cu->selstart-1)) && (charidx <= (cu->selend-1))) sel= 1; } - */ +#endif /* make a copy at distance ofsx,ofsy with shear*/ fsize= cu->fsize; @@ -541,7 +541,7 @@ struct chartrans *BKE_text_to_curve(Main *bmain, Scene *scene, Object *ob, int m wchar_t *mem, *tmp, ascii; /* renark: do calculations including the trailing '\0' of a string - because the cursor can be at that location */ + * because the cursor can be at that location */ if(ob->type!=OB_FONT) return NULL; @@ -941,7 +941,7 @@ struct chartrans *BKE_text_to_curve(Main *bmain, Scene *scene, Object *ob, int m if(mode==FO_CURSUP || mode==FO_CURSDOWN || mode==FO_PAGEUP || mode==FO_PAGEDOWN) { /* 2: curs up - 3: curs down */ + * 3: curs down */ ct= chartransdata+cu->pos; if((mode==FO_CURSUP || mode==FO_PAGEUP) && ct->linenr==0); diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 183483ef7a8..ce840b63d5f 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -337,7 +337,7 @@ static void group_replaces_nla(Object *parent, Object *target, char mode) #endif /* puts all group members in local timing system, after this call -you can draw everything, leaves tags in objects to signal it needs further updating */ + * you can draw everything, leaves tags in objects to signal it needs further updating */ /* note: does not work for derivedmesh and render... it recreates all again in convertblender.c */ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group *group) diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 58c88682d3f..533dd783422 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -79,7 +79,7 @@ static void icon_free(void *val) } /* create an id for a new icon and make sure that ids from deleted icons get reused - after the integer number range is used up */ + * after the integer number range is used up */ static int get_next_free_id(void) { int startId = gFirstIconId; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 5cef30894ef..163c3721dc8 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -60,8 +60,8 @@ static char idp_size_table[] = { /* --------- property array type -------------*/ -/*note: as a start to move away from the stupid IDP_New function, this type - has it's own allocation function.*/ +/* note: as a start to move away from the stupid IDP_New function, this type + * has it's own allocation function.*/ IDProperty *IDP_NewIDPArray(const char *name) { IDProperty *prop = MEM_callocN(sizeof(IDProperty), "IDProperty prop array"); @@ -82,12 +82,12 @@ IDProperty *IDP_CopyIDPArray(IDProperty *array) narray->data.pointer = MEM_dupallocN(array->data.pointer); for (i=0; i<narray->len; i++) { - /*ok, the copy functions always allocate a new structure, - which doesn't work here. instead, simply copy the - contents of the new structure into the array cell, - then free it. this makes for more maintainable - code than simply reimplementing the copy functions - in this loop.*/ + /* ok, the copy functions always allocate a new structure, + * which doesn't work here. instead, simply copy the + * contents of the new structure into the array cell, + * then free it. this makes for more maintainable + * code than simply reimplementing the copy functions + * in this loop.*/ tmp = IDP_CopyProperty(GETPROP(narray, i)); memcpy(GETPROP(narray, i), tmp, sizeof(IDProperty)); MEM_freeN(tmp); @@ -368,8 +368,8 @@ void IDP_ConcatStringC(IDProperty *prop, const char *st) int newlen; newlen = prop->len + strlen(st); - /*we have to remember that prop->len includes the null byte for strings. - so there's no need to add +1 to the resize function.*/ + /* we have to remember that prop->len includes the null byte for strings. + * so there's no need to add +1 to the resize function.*/ IDP_ResizeArray(prop, newlen); strcat(prop->data.pointer, st); } @@ -378,8 +378,8 @@ void IDP_ConcatString(IDProperty *str1, IDProperty *append) { int newlen; - /*since ->len for strings includes the NULL byte, we have to subtract one or - we'll get an extra null byte after each concatination operation.*/ + /* since ->len for strings includes the NULL byte, we have to subtract one or + * we'll get an extra null byte after each concatination operation.*/ newlen = str1->len + append->len - 1; IDP_ResizeArray(str1, newlen); strcat(str1->data.pointer, append->data.pointer); @@ -455,8 +455,8 @@ void IDP_SyncGroupValues(IDProperty *dest, IDProperty *src) } /* - replaces all properties with the same name in a destination group from a source group. -*/ + * replaces all properties with the same name in a destination group from a source group. + */ void IDP_ReplaceGroupInGroup(IDProperty *dest, IDProperty *src) { IDProperty *loop, *prop; @@ -483,9 +483,9 @@ void IDP_ReplaceGroupInGroup(IDProperty *dest, IDProperty *src) } } /* - replaces a property with the same name in a group, or adds - it if the propery doesn't exist. -*/ + * replaces a property with the same name in a group, or adds + * it if the propery doesn't exist. + */ void IDP_ReplaceInGroup(IDProperty *group, IDProperty *prop) { IDProperty *loop; @@ -502,8 +502,8 @@ void IDP_ReplaceInGroup(IDProperty *group, IDProperty *prop) } } -/*returns 0 if an id property with the same name exists and it failed, - or 1 if it succeeded in adding to the group.*/ +/* returns 0 if an id property with the same name exists and it failed, + * or 1 if it succeeded in adding to the group.*/ int IDP_AddToGroup(IDProperty *group, IDProperty *prop) { if (IDP_GetPropertyFromGroup(group, prop->name) == NULL) { @@ -574,10 +574,10 @@ void IDP_FreeIterBeforeEnd(void *vself) MEM_freeN(vself); } -/*Ok, the way things work, Groups free the ID Property structs of their children. - This is because all ID Property freeing functions free only direct data (not the ID Property - struct itself), but for Groups the child properties *are* considered - direct data.*/ +/* Ok, the way things work, Groups free the ID Property structs of their children. + * This is because all ID Property freeing functions free only direct data (not the ID Property + * struct itself), but for Groups the child properties *are* considered + * direct data. */ static void IDP_FreeGroup(IDProperty *prop) { IDProperty *loop; @@ -761,9 +761,9 @@ IDProperty *IDP_New(const int type, const IDPropertyTemplate *val, const char *n return prop; } -/*NOTE: this will free all child properties including list arrays and groups! - Also, note that this does NOT unlink anything! Plus it doesn't free - the actual IDProperty struct either.*/ +/* NOTE: this will free all child properties including list arrays and groups! + * Also, note that this does NOT unlink anything! Plus it doesn't free + * the actual IDProperty struct either.*/ void IDP_FreeProperty(IDProperty *prop) { switch (prop->type) { @@ -782,8 +782,8 @@ void IDP_FreeProperty(IDProperty *prop) } } -/*Unlinks any IDProperty<->ID linkage that might be going on. - note: currently unused.*/ +/* Unlinks any IDProperty<->ID linkage that might be going on. + * note: currently unused.*/ void IDP_UnlinkProperty(IDProperty *prop) { switch (prop->type) { diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 37a95382c25..22e9d1ccf4b 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -324,7 +324,7 @@ Image *copy_image(Image *ima) static void extern_local_image(Image *UNUSED(ima)) { /* Nothing to do: images don't link to other IDs. This function exists to - match id_make_local pattern. */ + * match id_make_local pattern. */ } void make_local_image(struct Image *ima) @@ -343,7 +343,7 @@ void make_local_image(struct Image *ima) if(ima->id.lib==NULL) return; /* Can't take short cut here: must check meshes at least because of bogus - texface ID refs. - z0r */ + * texface ID refs. - z0r */ #if 0 if(ima->id.us==1) { id_clear_lib_data(bmain, &ima->id); @@ -438,8 +438,8 @@ void make_local_image(struct Image *ima) brush= brush->id.next; } /* Transfer references in texfaces. Texfaces don't add to image ID - user count *unless* there are no other users. See - readfile.c:lib_link_mtface. */ + * user count *unless* there are no other users. See + * readfile.c:lib_link_mtface. */ me= bmain->mesh.first; while(me) { if(me->mtface) { @@ -697,9 +697,9 @@ void free_old_images(void) int ctime = (int)PIL_check_seconds_timer(); /* - Run garbage collector once for every collecting period of time - if textimeout is 0, that's the option to NOT run the collector - */ + * Run garbage collector once for every collecting period of time + * if textimeout is 0, that's the option to NOT run the collector + */ if (U.textimeout == 0 || ctime % U.texcollectrate || ctime == lasttime) return; @@ -712,10 +712,8 @@ void free_old_images(void) ima= G.main->image.first; while(ima) { if((ima->flag & IMA_NOCOLLECT)==0 && ctime - ima->lastused > U.textimeout) { - /* - If it's in GL memory, deallocate and set time tag to current time - This gives textures a "second chance" to be used before dying. - */ + /* If it's in GL memory, deallocate and set time tag to current time + * This gives textures a "second chance" to be used before dying. */ if(ima->bindcode || ima->repbind) { GPU_free_image(ima); ima->lastused = ctime; @@ -797,11 +795,12 @@ void BKE_image_free_all_textures(void) if(ibuf->userflags & IB_BITMAPDIRTY) break; - /* if(ibuf->mipmap[0]) +#if 0 + if(ibuf->mipmap[0]) totsize+= 1.33*ibuf->x*ibuf->y*4; else - totsize+= ibuf->x*ibuf->y*4;*/ - + totsize+= ibuf->x*ibuf->y*4; +#endif } if(ibuf==NULL) image_free_buffers(ima); @@ -1722,22 +1721,21 @@ struct anim *openanim(const char *name, int flags, int streamindex) /* Notes about Image storage -- packedfile - -> written in .blend -- filename - -> written in .blend -- movie - -> comes from packedfile or filename -- renderresult - -> comes from packedfile or filename -- listbase - -> ibufs from exrhandle -- flipbook array - -> ibufs come from movie, temporary renderresult or sequence -- ibuf - -> comes from packedfile or filename or generated - -*/ + * - packedfile + * -> written in .blend + * - filename + * -> written in .blend + * - movie + * -> comes from packedfile or filename + * - renderresult + * -> comes from packedfile or filename + * - listbase + * -> ibufs from exrhandle + * - flipbook array + * -> ibufs come from movie, temporary renderresult or sequence + * - ibuf + * -> comes from packedfile or filename or generated + */ /* forces existence of 1 Image for renderout or nodes, returns Image */ @@ -1910,7 +1908,7 @@ void BKE_image_release_renderresult(Scene *scene, Image *ima) void BKE_image_backup_render(Scene *scene, Image *ima) { /* called right before rendering, ima->renders contains render - result pointers for everything but the current render */ + * result pointers for everything but the current render */ Render *re= RE_GetRender(scene->id.name); int slot= ima->render_slot, last= ima->last_render_slot; @@ -2229,7 +2227,7 @@ static ImBuf *image_get_ibuf_multilayer(Image *ima, ImageUser *iuser) /* showing RGBA result itself (from compo/sequence) or - like exr, using layers etc */ + * like exr, using layers etc */ /* always returns a single ibuf, also during render progress */ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_r) { @@ -2321,8 +2319,8 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_ ibuf->y= rres.recty; /* free rect buffer if float buffer changes, so it can be recreated with - the updated result, and also in case we got byte buffer from sequencer, - so we don't keep reference to freed buffer */ + * the updated result, and also in case we got byte buffer from sequencer, + * so we don't keep reference to freed buffer */ if(ibuf->rect_float!=rectf || rect || !rectf) imb_freerectImBuf(ibuf); @@ -2513,7 +2511,7 @@ ImBuf *BKE_image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r) else if(ima->source == IMA_SRC_VIEWER) { if(ima->type==IMA_TYPE_R_RESULT) { /* always verify entirely, and potentially - returns pointer to release later */ + * returns pointer to release later */ ibuf= image_get_render_result(ima, iuser, lock_r); } else if(ima->type==IMA_TYPE_COMPOSITE) { diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c index c6cb8c9582a..111350bb1bb 100644 --- a/source/blender/blenkernel/intern/image_gen.c +++ b/source/blender/blenkernel/intern/image_gen.c @@ -69,7 +69,7 @@ void BKE_image_buf_fill_color(unsigned char *rect, float *rect_float, int width, void BKE_image_buf_fill_checker(unsigned char *rect, float *rect_float, int width, int height) { /* these two passes could be combined into one, but it's more readable and - * easy to tweak like this, speed isn't really that much of an issue in this situation... */ + * easy to tweak like this, speed isn't really that much of an issue in this situation... */ int checkerwidth= 32, dark= 1; int x, y; diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 40fe3626848..5c5fe2f4156 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -663,8 +663,10 @@ static const char *sound_adrcodes_to_paths (int adrcode, int *array_index) case SND_PITCH: return "pitch"; /* XXX Joshua -- I had wrapped panning in rna, but someone commented out, calling it "unused" */ - /* case SND_PANNING: - return "panning"; */ +#if 0 + case SND_PANNING: + return "panning"; +#endif case SND_ATTEN: return "attenuation"; } @@ -762,11 +764,12 @@ static const char *particle_adrcodes_to_paths (int adrcode, int *array_index) return "settings.billboard_tilt"; /* PartDeflect needs to be sorted out properly in rna_object_force; - If anyone else works on this, but is unfamiliar, these particular - settings reference the particles of the system themselves - being used as forces -- it will use the same rna structure - as the similar object forces */ - /*case PART_PD_FSTR: + * If anyone else works on this, but is unfamiliar, these particular + * settings reference the particles of the system themselves + * being used as forces -- it will use the same rna structure + * as the similar object forces */ +#if 0 + case PART_PD_FSTR: if (part->pd) poin= &(part->pd->f_strength); break; case PART_PD_FFALL: @@ -783,11 +786,12 @@ static const char *particle_adrcodes_to_paths (int adrcode, int *array_index) break; case PART_PD2_FMAXD: if (part->pd2) poin= &(part->pd2->maxdist); - break;*/ + break; +#endif - } - - return NULL; + } + + return NULL; } /* ------- */ @@ -1914,9 +1918,9 @@ void do_versions_ipos_to_animato(Main *main) } /* patch adrcode, so that we can map - to different DNA variables later - (semi-hack (tm) ) - */ + * to different DNA variables later + * (semi-hack (tm) ) + */ switch (seq->type) { case SEQ_IMAGE: case SEQ_META: diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 1b678225135..0b4b6d164ce 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -221,9 +221,9 @@ void make_local_key(Key *key) { /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if(key==NULL) return; key->id.lib= NULL; @@ -265,7 +265,7 @@ void sort_keys(Key *key) if(key->ipo && key->ipo->curve.first != key->ipo->curve.last ) { for(icu= key->ipo->curve.first; icu; icu= icu->next) { /* if we find the curve, remove it and reinsert in the - right place */ + * right place */ if(icu->adrcode==kb->adrcode) { IpoCurve *icu2; BLI_remlink(&key->ipo->curve, icu); @@ -537,7 +537,7 @@ static char *key_block_get_data(Key *key, KeyBlock *actkb, KeyBlock *kb, char ** { if(kb == actkb) { /* this hack makes it possible to edit shape keys in - edit mode with shape keys blending applied */ + * edit mode with shape keys blending applied */ if(GS(key->from->name) == ID_ME) { Mesh *me; BMVert *eve; diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 6b4cdc70aea..4e4dca51e7d 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -161,9 +161,9 @@ void make_local_lamp(Lamp *la) int is_local= FALSE, is_lib= FALSE; /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if(la->id.lib==NULL) return; if(la->id.us==1) { diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 79922e47564..0cddd978263 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -459,7 +459,7 @@ void end_latt_deform(Object *ob) } /* calculations is in local space of deformed object - so we store in latmat transform from path coord inside object + * so we store in latmat transform from path coord inside object */ typedef struct { float dmin[3], dmax[3]; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 63c9d799f04..367a722d8c3 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -123,8 +123,8 @@ #define MAX_IDPUP 60 /* was 24 */ /* GS reads the memory pointed at in a specific ordering. - only use this definition, makes little and big endian systems - work fine, in conjunction with MAKE_ID */ + * only use this definition, makes little and big endian systems + * work fine, in conjunction with MAKE_ID */ /* from blendef: */ #define GS(a) (*((short *)(a))) @@ -409,7 +409,7 @@ int id_single_user(bContext *C, ID *id, PointerRNA *ptr, PropertyRNA *prop) /* copy animation actions too */ BKE_copy_animdata_id_action(id); /* us is 1 by convention, but RNA_property_pointer_set - will also incremement it, so set it to zero */ + * will also incremement it, so set it to zero */ newid->us= 0; /* assign copy */ @@ -577,14 +577,14 @@ int set_listbasepointers(Main *main, ListBase **lb) } /* *********** ALLOC AND FREE ***************** - -free_libblock(ListBase *lb, ID *id ) - provide a list-basis and datablock, but only ID is read - -void *alloc_libblock(ListBase *lb, type, name) - inserts in list and returns a new ID - - ***************************** */ + * + * free_libblock(ListBase *lb, ID *id ) + * provide a list-basis and datablock, but only ID is read + * + * void *alloc_libblock(ListBase *lb, type, name) + * inserts in list and returns a new ID + * + * **************************** */ static ID *alloc_libblock_notest(short type) { @@ -1268,16 +1268,18 @@ int new_id(ListBase *lb, ID *id, const char *tname) * however all data in blender should be sorted, not just duplicate names * sorting should not hurt, but noting just incause it alters the way other * functions work, so sort every time */ - /* if( result ) - sort_alpha_id(lb, id);*/ - +#if 0 + if( result ) + sort_alpha_id(lb, id); +#endif + sort_alpha_id(lb, id); return result; } /* Pull an ID out of a library (make it local). Only call this for IDs that - don't have other library users. */ + * don't have other library users. */ void id_clear_lib_data(Main *bmain, ID *id) { BKE_id_lib_local_paths(bmain, id->lib, id); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index db9f6325e89..898f881857a 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -290,9 +290,9 @@ void make_local_material(Material *ma) int a, is_local= FALSE, is_lib= FALSE; /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if (ma->id.lib==NULL) return; @@ -304,7 +304,7 @@ void make_local_material(Material *ma) } /* Check which other IDs reference this one to determine if it's used by - lib or local */ + * lib or local */ /* test objects */ ob= bmain->object.first; while(ob) { @@ -1614,7 +1614,7 @@ static void calculate_tface_materialname(char *matname, char *newname, int flag) // otherwise do: int digits = integer_getdigits(flag); /* clamp the old name, remove the MA prefix and add the .TF.flag suffix - e.g. matname = "MALoooooooooooooongName"; newname = "Loooooooooooooon.TF.2" */ + * e.g. matname = "MALoooooooooooooongName"; newname = "Loooooooooooooon.TF.2" */ BLI_snprintf(newname, MAX_ID_NAME, "%.*s.TF.%0*d", MAX_ID_NAME-(digits+5), matname, digits, flag); } diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index ed7e84cf174..b143e496446 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -278,7 +278,7 @@ void tex_space_mball(Object *ob) min[0] = min[1] = min[2] = -1.0f; max[0] = max[1] = max[2] = 1.0f; } - /* +#if 0 loc[0]= (min[0]+max[0])/2.0f; loc[1]= (min[1]+max[1])/2.0f; loc[2]= (min[2]+max[2])/2.0f; @@ -286,7 +286,7 @@ void tex_space_mball(Object *ob) size[0]= (max[0]-min[0])/2.0f; size[1]= (max[1]-min[1])/2.0f; size[2]= (max[2]-min[2])/2.0f; - */ +#endif boundbox_set_from_min_max(bb, min, max); } @@ -485,7 +485,7 @@ Object *find_basis_mball(Scene *scene, Object *basis) * "An Implicit Surface Polygonizer" * by Jules Bloomenthal, jbloom@beauty.gmu.edu * in "Graphics Gems IV", Academic Press, 1994 - + * * Authored by Jules Bloomenthal, Xerox PARC. * Copyright (c) Xerox Corporation, 1991. All rights reserved. * Permission is granted to reproduce, use and distribute this code for @@ -949,7 +949,7 @@ void testface(int i, int j, int k, CUBE* old, int bit, int c1, int c2, int c3, i } /* setcorner: return corner with the given lattice location - set (and cache) its function value */ + * set (and cache) its function value */ CORNER *setcorner (PROCESS* p, int i, int j, int k) { diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 1cab220836b..1d7d8a23107 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -121,8 +121,8 @@ static const char *cmpcode_to_str(int code) } } -/*thresh is threshold for comparing vertices, uvs, vertex colors, - weights, etc.*/ +/* thresh is threshold for comparing vertices, uvs, vertex colors, + * weights, etc.*/ static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2, float thresh) { CustomDataLayer *l1, *l2; @@ -438,8 +438,8 @@ void copy_dverts(MDeformVert *dst, MDeformVert *src, int copycount) void free_dverts(MDeformVert *dvert, int totvert) { /* Instead of freeing the verts directly, - call this function to delete any special - vert data */ + * call this function to delete any special + * vert data */ int i; if (!dvert) @@ -738,7 +738,7 @@ void transform_mesh_orco_verts(Mesh *me, float (*orco)[3], int totvert, int inve } /* rotates the vertices of a face in case v[2] or v[3] (vertex index) is = 0. - this is necessary to make the if (mface->v4) check for quads work */ + * this is necessary to make the if (mface->v4) check for quads work */ int test_index_face(MFace *mface, CustomData *fdata, int mfindex, int nr) { /* first test if the face is legal */ @@ -1852,8 +1852,8 @@ static void bm_corners_to_loops(Mesh *me, int findex, int loopstart, int numTex, if (corners == 0) { /* Empty MDisp layers appear in at least one of the sintel.blend files. - Not sure why this happens, but it seems fine to just ignore them here. - If corners==0 for a non-empty layer though, something went wrong. */ + * Not sure why this happens, but it seems fine to just ignore them here. + * If corners==0 for a non-empty layer though, something went wrong. */ BLI_assert(fd->totdisp == 0); } else { @@ -2071,8 +2071,8 @@ void free_uv_vert_map(UvVertMap *vmap) } /* Generates a map where the key is the vertex and the value is a list - of polys that use that vertex as a corner. The lists are allocated - from one memory pool. */ + * of polys that use that vertex as a corner. The lists are allocated + * from one memory pool. */ void create_vert_poly_map(ListBase **map, IndexNode **mem, MPoly *mpoly, MLoop *mloop, const int totvert, const int totpoly, const int totloop) @@ -2097,8 +2097,8 @@ void create_vert_poly_map(ListBase **map, IndexNode **mem, } /* Generates a map where the key is the vertex and the value is a list - of edges that use that vertex as an endpoint. The lists are allocated - from one memory pool. */ + * of edges that use that vertex as an endpoint. The lists are allocated + * from one memory pool. */ void create_vert_edge_map(ListBase **map, IndexNode **mem, const MEdge *medge, const int totvert, const int totedge) { int i, j; @@ -2185,8 +2185,8 @@ void mesh_loops_to_mface_corners(CustomData *fdata, CustomData *ldata, } /* - this function recreates a tessellation. - returns number of tessellation faces. + * this function recreates a tessellation. + * returns number of tessellation faces. */ int mesh_recalcTessellation(CustomData *fdata, CustomData *ldata, CustomData *pdata, @@ -2585,7 +2585,7 @@ int mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata, * polygon See Graphics Gems for * computing newell normal. * -*/ + */ static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart, MVert *mvert, float normal[3]) { @@ -2612,16 +2612,16 @@ static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart, } /* newell's method - - so thats?: - (a[1] - b[1]) * (a[2] + b[2]); - a[1]*b[2] - b[1]*a[2] - b[1]*b[2] + a[1]*a[2] - - odd. half of that is the cross product. . .what's the - other half? - - also could be like a[1]*(b[2] + a[2]) - b[1]*(a[2] - b[2]) - */ + * + * so thats?: + * (a[1] - b[1]) * (a[2] + b[2]); + * a[1]*b[2] - b[1]*a[2] - b[1]*b[2] + a[1]*a[2] + * + * odd. half of that is the cross product. . .what's the + * other half? + * + * also could be like a[1]*(b[2] + a[2]) - b[1]*(a[2] - b[2]) + */ n[0] += (u[1] - v[1]) * (u[2] + v[2]); n[1] += (u[2] - v[2]) * (u[0] + v[0]); @@ -2834,7 +2834,7 @@ float mesh_calc_poly_area(MPoly *mpoly, MLoop *loopstart, } /* Find the index of the loop in 'poly' which references vertex, - returns -1 if not found */ + * returns -1 if not found */ int poly_find_loop_from_vert(const MPoly *poly, const MLoop *loopstart, unsigned vert) { @@ -2848,8 +2848,8 @@ int poly_find_loop_from_vert(const MPoly *poly, const MLoop *loopstart, } /* Fill 'adj_r' with the loop indices in 'poly' adjacent to the - vertex. Returns the index of the loop matching vertex, or -1 if the - vertex is not in 'poly' */ + * vertex. Returns the index of the loop matching vertex, or -1 if the + * vertex is not in 'poly' */ int poly_get_adj_loops_from_vert(unsigned adj_r[3], const MPoly *poly, const MLoop *mloop, unsigned vert) { diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 4a988f0b278..fbd7a5fb47b 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -538,7 +538,7 @@ void BKE_mesh_calc_edges(Mesh *mesh, int update) if (mesh->totpoly) { /* second pass, iterate through all loops again and assign - the newly created edges to them. */ + * the newly created edges to them. */ MPoly *mp= mesh->mpoly; for(i=0; i < mesh->totpoly; i++, mp++) { MLoop *l= &mesh->mloop[mp->loopstart]; diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 9a67260ded4..4ba47eb6673 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -373,11 +373,11 @@ LinkNode *modifiers_calcDataMasks(struct Scene *scene, Object *ob, ModifierData } /* build the list of required data masks - each mask in the list must - * include all elements of the masks that follow it - * - * note the list is currently in reverse order, so "masks that follow it" - * actually means "masks that precede it" at the moment - */ + * include all elements of the masks that follow it + * + * note the list is currently in reverse order, so "masks that follow it" + * actually means "masks that precede it" at the moment + */ for(curr = dataMasks, prev = NULL; curr; prev = curr, curr = curr->next) { if(prev) { CustomDataMask prev_mask = (CustomDataMask)GET_INT_FROM_POINTER(prev->link); @@ -414,9 +414,9 @@ ModifierData *modifiers_getLastPreview(struct Scene *scene, ModifierData *md, in ModifierData *modifiers_getVirtualModifierList(Object *ob) { - /* Kinda hacky, but should be fine since we are never - * reentrant and avoid free hassles. - */ + /* Kinda hacky, but should be fine since we are never + * reentrant and avoid free hassles. + */ static ArmatureModifierData amd; static CurveModifierData cmd; static LatticeModifierData lmd; @@ -491,8 +491,7 @@ Object *modifiers_isDeformedByArmature(Object *ob) ModifierData *md = modifiers_getVirtualModifierList(ob); ArmatureModifierData *amd= NULL; - /* return the first selected armature, this lets us use multiple armatures - */ + /* return the first selected armature, this lets us use multiple armatures */ for (; md; md=md->next) { if (md->type==eModifierType_Armature) { amd = (ArmatureModifierData*) md; @@ -508,16 +507,15 @@ Object *modifiers_isDeformedByArmature(Object *ob) } /* Takes an object and returns its first selected lattice, else just its -* lattice -* This should work for multiple lattics per object -*/ + * lattice + * This should work for multiple lattics per object + */ Object *modifiers_isDeformedByLattice(Object *ob) { ModifierData *md = modifiers_getVirtualModifierList(ob); LatticeModifierData *lmd= NULL; - /* return the first selected lattice, this lets us use multiple lattices - */ + /* return the first selected lattice, this lets us use multiple lattices */ for (; md; md=md->next) { if (md->type==eModifierType_Lattice) { lmd = (LatticeModifierData*) md; @@ -614,7 +612,7 @@ void test_object_modifiers(Object *ob) ModifierData *md; /* just multires checked for now, since only multires - modifies mesh data */ + * modifies mesh data */ if(ob->type != OB_MESH) return; diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index 4d8f76467b1..0af6b9dd219 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -154,7 +154,7 @@ static void get_sequence_fname(MovieClip *clip, int framenr, char *name) BLI_stringdec(name, head, tail, &numlen); /* movieclips always points to first image from sequence, - autoguess offset for now. could be something smarter in the future */ + * autoguess offset for now. could be something smarter in the future */ offset= sequence_guess_offset(clip->name, strlen(head), numlen); if (numlen) BLI_stringenc(name, head, tail, numlen, offset+framenr-1); @@ -396,9 +396,9 @@ static MovieClip *movieclip_alloc(const char *name) } /* checks if image was already loaded, then returns same image - otherwise creates new. - does not load ibuf itself - pass on optional frame for #name images */ + * otherwise creates new. + * does not load ibuf itself + * pass on optional frame for #name images */ MovieClip *BKE_add_movieclip_file(const char *name) { MovieClip *clip; @@ -484,7 +484,7 @@ static ImBuf *get_undistorted_ibuf(MovieClip *clip, struct MovieDistortion *dist ImBuf *undistibuf; /* XXX: because of #27997 do not use float buffers to undistort, - otherwise, undistorted proxy can be darker than it should */ + * otherwise, undistorted proxy can be darker than it should */ imb_freerectfloatImBuf(ibuf); if(distortion) @@ -640,7 +640,7 @@ static ImBuf *movieclip_get_postprocessed_ibuf(MovieClip *clip, MovieClipUser *u int framenr= user->framenr, need_postprocess= 0; /* cache isn't threadsafe itself and also loading of movies - can't happen from concurent threads that's why we use lock here */ + * can't happen from concurent threads that's why we use lock here */ BLI_lock_thread(LOCK_MOVIECLIP); /* try to obtain cached postprocessed frame first */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index f9817d5b6f5..9d61a12d237 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -827,8 +827,8 @@ void ntreeClearPreview(bNodeTree *ntree) } /* hack warning! this function is only used for shader previews, and -since it gets called multiple times per pixel for Ztransp we only -add the color once. Preview gets cleared before it starts render though */ + * since it gets called multiple times per pixel for Ztransp we only + * add the color once. Preview gets cleared before it starts render though */ void nodeAddToPreview(bNode *node, float *col, int x, int y, int do_manage) { bNodePreview *preview= node->preview; @@ -1036,7 +1036,7 @@ void ntreeSetOutput(bNodeTree *ntree) } /* here we could recursively set which nodes have to be done, - might be different for editor or for "real" use... */ + * might be different for editor or for "real" use... */ } typedef struct MakeLocalCallData { @@ -1083,9 +1083,9 @@ void ntreeMakeLocal(bNodeTree *ntree) MakeLocalCallData cd; /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if(ntree->id.lib==NULL) return; if(ntree->id.us==1) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 52ddfb67bf8..32a3ca2b732 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1950,9 +1950,9 @@ void where_is_object_time(Scene *scene, Object *ob, float ctime) } /* get object transformation matrix without recalculating dependencies and - constraints -- assume dependencies are already solved by depsgraph. - no changes to object and it's parent would be done. - used for bundles orientation in 3d space relative to parented blender camera */ + * constraints -- assume dependencies are already solved by depsgraph. + * no changes to object and it's parent would be done. + * used for bundles orientation in 3d space relative to parented blender camera */ void where_is_object_mat(Scene *scene, Object *ob, float obmat[4][4]) { float slowmat[4][4] = MAT4_UNITY; @@ -2058,7 +2058,7 @@ void where_is_object(struct Scene *scene, Object *ob) void where_is_object_simul(Scene *scene, Object *ob) /* was written for the old game engine (until 2.04) */ /* It seems that this function is only called -for a lamp that is the child of another object */ + * for a lamp that is the child of another object */ { Object *par; float *fp1, *fp2; @@ -2472,16 +2472,16 @@ void object_handle_update(Scene *scene, Object *ob) if (ob->recalc & OB_RECALC_DATA) { if (ob->type==OB_ARMATURE) { /* this happens for reading old files and to match library armatures - with poses we do it ahead of where_is_object to ensure animation - is evaluated on the rebuilt pose, otherwise we get incorrect poses - on file load */ + * with poses we do it ahead of where_is_object to ensure animation + * is evaluated on the rebuilt pose, otherwise we get incorrect poses + * on file load */ if (ob->pose==NULL || (ob->pose->flag & POSE_RECALC)) armature_rebuild_pose(ob, ob->data); } } /* XXX new animsys warning: depsgraph tag OB_RECALC_DATA should not skip drivers, - which is only in where_is_object now */ + * which is only in where_is_object now */ // XXX: should this case be OB_RECALC_OB instead? if (ob->recalc & OB_RECALC_ALL) { @@ -2658,8 +2658,8 @@ void object_sculpt_modifiers_changed(Object *ob) if (!ss->cache) { /* we free pbvh on changes, except during sculpt since it can't deal with - changing PVBH node organization, we hope topology does not change in - the meantime .. weak */ + * changing PVBH node organization, we hope topology does not change in + * the meantime .. weak */ if (ss->pbvh) { BLI_pbvh_free(ss->pbvh); ss->pbvh= NULL; diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index 65db275b61f..dd9444d87e0 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -726,14 +726,14 @@ void BKE_simulate_ocean(struct Ocean *o, float t, float scale, float chop_amount } fftw_execute(o->_N_z_plan); - /*for ( i = 0 ; i < o->_M ; ++i) - { - for ( j = 0 ; j < o->_N ; ++j) - { - o->_N_y[i*o->_N+j] = 1.0f/scale; - } - } - (MEM01)*/ +#if 0 + for ( i = 0 ; i < o->_M ; ++i) { + for ( j = 0 ; j < o->_N ; ++j) { + o->_N_y[i*o->_N+j] = 1.0f/scale; + } + } + (MEM01) +#endif o->_N_y = 1.0f/scale; } } // section 8 @@ -1260,12 +1260,12 @@ void BKE_bake_ocean(struct Ocean *o, struct OceanCache *och, void (*update_cb)(v // break up the foam where height (Y) is low (wave valley), // and X and Z displacement is greatest - /* +#if 0 vec[0] = ocr.disp[0]; vec[1] = ocr.disp[2]; hor_stretch = len_v2(vec); CLAMP(hor_stretch, 0.0, 1.0); - */ +#endif neg_disp = ocr.disp[1] < 0.0f ? 1.0f+ocr.disp[1] : 1.0f; neg_disp = neg_disp < 0.0f ? 0.0f : neg_disp; diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 2decc40da81..aaf15d683d8 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -321,16 +321,14 @@ int writePackedFile(ReportList *reports, const char *filename, PackedFile *pf, i return (ret_value); } -/* - -This function compares a packed file to a 'real' file. -It returns an integer indicating if: - -PF_EQUAL - the packed file and original file are identical -PF_DIFFERENT - the packed file and original file differ -PF_NOFILE - the original file doens't exist - -*/ +/* + * This function compares a packed file to a 'real' file. + * It returns an integer indicating if: + * + * PF_EQUAL - the packed file and original file are identical + * PF_DIFFERENT - the packed file and original file differ + * PF_NOFILE - the original file doens't exist + */ int checkPackedFile(const char *filename, PackedFile *pf) { @@ -380,14 +378,11 @@ int checkPackedFile(const char *filename, PackedFile *pf) return(ret_val); } -/* - - unpackFile() looks at the existing files (abs_name, local_name) and a packed file. - -It returns a char *to the existing file name / new file name or NULL when -there was an error or when the user desides to cancel the operation. - -*/ +/* unpackFile() looks at the existing files (abs_name, local_name) and a packed file. + * + * It returns a char *to the existing file name / new file name or NULL when + * there was an error or when the user desides to cancel the operation. + */ char *unpackFile(ReportList *reports, const char *abs_name, const char *local_name, PackedFile *pf, int how) { diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 33e2c2376a3..78df8d26c4d 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2859,8 +2859,8 @@ static void cache_key_incremental_rotation(ParticleCacheKey *key0, ParticleCache cosangle= dot_v3v3(tangent, prev_tangent); /* note we do the comparison on cosangle instead of - * angle, since floating point accuracy makes it give - * different results across platforms */ + * angle, since floating point accuracy makes it give + * different results across platforms */ if(cosangle > 0.999999f) { copy_v4_v4(key1->rot, key2->rot); } @@ -4426,7 +4426,7 @@ void psys_get_dupli_texture(ParticleSystem *psys, ParticleSettings *part, Partic if (num >= psmd->dm->getNumTessFaces(psmd->dm)) { /* happens when simplify is enabled - * gives invalid coords but would crash otherwise */ + * gives invalid coords but would crash otherwise */ num= DMCACHE_NOTFOUND; } diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index e4800ac25a3..ee4f3d1701e 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -332,11 +332,11 @@ static void alloc_child_particles(ParticleSystem *psys, int tot) void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys) { /* use for building derived mesh mapping info: - - node: the allocated links - total derived mesh element count - nodearray: the array of nodes aligned with the base mesh's elements, so - each original elements can reference its derived elements - */ + * + * node: the allocated links - total derived mesh element count + * nodearray: the array of nodes aligned with the base mesh's elements, so + * each original elements can reference its derived elements + */ Mesh *me= (Mesh*)ob->data; PARTICLE_P; @@ -2213,19 +2213,19 @@ static void integrate_particle(ParticleSettings *part, ParticleData *pa, float d } /********************************************************************************************************* - SPH fluid physics - - In theory, there could be unlimited implementation of SPH simulators - - This code uses in some parts adapted algorithms from the pseudo code as outlined in the Research paper: - - Titled: Particle-based Viscoelastic Fluid Simulation. - Authors: Simon Clavet, Philippe Beaudoin and Pierre Poulin - Website: http://www.iro.umontreal.ca/labs/infographie/papers/Clavet-2005-PVFS/ - - Presented at Siggraph, (2005) - -***********************************************************************************************************/ + * SPH fluid physics + * + * In theory, there could be unlimited implementation of SPH simulators + * + * This code uses in some parts adapted algorithms from the pseudo code as outlined in the Research paper: + * + * Titled: Particle-based Viscoelastic Fluid Simulation. + * Authors: Simon Clavet, Philippe Beaudoin and Pierre Poulin + * Website: http://www.iro.umontreal.ca/labs/infographie/papers/Clavet-2005-PVFS/ + * + * Presented at Siggraph, (2005) + * + * ********************************************************************************************************/ #define PSYS_FLUID_SPRINGS_INITIAL_SIZE 256 static ParticleSpring *sph_spring_add(ParticleSystem *psys, ParticleSpring *spring) { @@ -2344,7 +2344,7 @@ typedef struct SPHData { EdgeHash *eh; float *gravity; /* Average distance to neighbours (other particles in the support domain), - for calculating the Courant number (adaptive time step). */ + * for calculating the Courant number (adaptive time step). */ int pass; float element_size; float flow[3]; @@ -3234,9 +3234,9 @@ static int collision_response(ParticleData *pa, ParticleCollision *col, BVHTreeR sub_v3_v3v3(v1_tan, v0_tan, vc_tan); /* The resulting velocity is a weighted average of particle cm & surface - * velocity. This weight (related to particle's moment of inertia) could - * be made a parameter for angular <-> linear conversion. - */ + * velocity. This weight (related to particle's moment of inertia) could + * be made a parameter for angular <-> linear conversion. + */ madd_v3_v3fl(v1_tan, vr_tan, -0.4); mul_v3_fl(v1_tan, 1.0f/1.4f); /* 1/(1+0.4) */ @@ -3699,17 +3699,17 @@ static void save_hair(ParticleSimulationData *sim, float UNUSED(cfra)) } /* Code for an adaptive time step based on the Courant-Friedrichs-Lewy - condition. */ + * condition. */ #define MIN_TIMESTEP 1.0f / 101.0f /* Tolerance of 1.5 means the last subframe neither favours growing nor - shrinking (e.g if it were 1.3, the last subframe would tend to be too - small). */ + * shrinking (e.g if it were 1.3, the last subframe would tend to be too + * small). */ #define TIMESTEP_EXPANSION_TOLERANCE 1.5f /* Calculate the speed of the particle relative to the local scale of the - simulation. This should be called once per particle during a simulation - step, after the velocity has been updated. element_size defines the scale of - the simulation, and is typically the distance to neighbourning particles. */ + * simulation. This should be called once per particle during a simulation + * step, after the velocity has been updated. element_size defines the scale of + * the simulation, and is typically the distance to neighbourning particles. */ void update_courant_num(ParticleSimulationData *sim, ParticleData *pa, float dtime, SPHData *sphdata) { diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 705f198865a..fab3f096d3e 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1026,11 +1026,11 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob, Scene *scene, int dup /* File handling */ -/* Takes an Object ID and returns a unique name - - id: object id - - cfra: frame for the cache, can be negative - - stack_index: index in the modifier stack. we can have cache for more then one stack_index -*/ +/* Takes an Object ID and returns a unique name + * - id: object id + * - cfra: frame for the cache, can be negative + * - stack_index: index in the modifier stack. we can have cache for more then one stack_index + */ #define MAX_PTCACHE_PATH FILE_MAX #define MAX_PTCACHE_FILE ((FILE_MAX)*2) @@ -2107,8 +2107,8 @@ int BKE_ptcache_write(PTCacheID *pid, unsigned int cfra) } /* youll need to close yourself after! * mode - PTCACHE_CLEAR_ALL, + */ -*/ /* Clears & resets */ void BKE_ptcache_id_clear(PTCacheID *pid, int mode, unsigned int cfra) { @@ -2687,7 +2687,7 @@ void BKE_ptcache_quick_cache_all(Main *bmain, Scene *scene) } /* Simulation thread, no need for interlocks as data written in both threads - are only unitary integers (I/O assumed to be atomic for them) */ + * are only unitary integers (I/O assumed to be atomic for them) */ typedef struct { int break_operation; int thread_ended; diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 150bb05d2d9..3d84278c878 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -719,8 +719,8 @@ int next_object(Scene **scene, int val, Base **base, Object **ob) if (fase!=F_DUPLI) { if ( (*base)->object->transflag & OB_DUPLI) { /* groups cannot be duplicated for mballs yet, - this enters eternal loop because of - makeDispListMBall getting called inside of group_duplilist */ + * this enters eternal loop because of + * makeDispListMBall getting called inside of group_duplilist */ if ((*base)->object->dup_group == NULL) { duplilist= object_duplilist((*scene), (*base)->object); @@ -757,10 +757,12 @@ int next_object(Scene **scene, int val, Base **base, Object **ob) } } } - - /* if (ob && *ob) { + +#if 0 + if (ob && *ob) { printf("Scene: '%s', '%s'\n", (*scene)->id.name+2, (*ob)->id.name+2); - } */ + } +#endif /* reset recursion test */ in_next_object= 0; @@ -836,7 +838,7 @@ char *scene_find_marker_name(Scene *scene, int frame) } /* return the current marker for this frame, -we can have more then 1 marker per frame, this just returns the first :/ */ + * we can have more then 1 marker per frame, this just returns the first :/ */ char *scene_find_last_marker_name(Scene *scene, int frame) { TimeMarker *marker, *best_marker = NULL; @@ -973,7 +975,7 @@ static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scen scene->customdata_mask= scene_parent->customdata_mask; /* sets first, we allow per definition current scene to have - dependencies on sets, but not the other way around. */ + * dependencies on sets, but not the other way around. */ if (scene->set) scene_update_tagged_recursive(bmain, scene->set, scene_parent); @@ -1009,10 +1011,10 @@ void scene_update_tagged(Main *bmain, Scene *scene) scene->physics_settings.quick_cache_step= 0; /* update all objects: drivers, matrices, displists, etc. flags set - by depgraph or manual, no layer check here, gets correct flushed - - in the future this should handle updates for all datablocks, not - only objects and scenes. - brecht */ + * by depgraph or manual, no layer check here, gets correct flushed + * + * in the future this should handle updates for all datablocks, not + * only objects and scenes. - brecht */ scene_update_tagged_recursive(bmain, scene, scene); /* extra call here to recalc scene animation (for sequencer) */ @@ -1057,8 +1059,8 @@ void scene_update_for_newframe(Main *bmain, Scene *sce, unsigned int lay) } /* flush recalc flags to dependencies, if we were only changing a frame - this would not be necessary, but if a user or a script has modified - some datablock before scene_update_tagged was called, we need the flush */ + * this would not be necessary, but if a user or a script has modified + * some datablock before scene_update_tagged was called, we need the flush */ DAG_ids_flush_tagged(bmain); /* Following 2 functions are recursive diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c index 5fadebc80f8..2d1577a86c1 100644 --- a/source/blender/blenkernel/intern/script.c +++ b/source/blender/blenkernel/intern/script.c @@ -33,12 +33,11 @@ #include "MEM_guardedalloc.h" -/* - +#if 0 #ifdef WITH_PYTHON #include "BPY_extern.h" // Blender Python library #endif -*/ +#endif /* XXX this function and so also the file should not be needed anymore, * since we have to force clearing all Python related data before freeing diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index aebdf3cef65..6a72933332b 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -3098,8 +3098,8 @@ void sequence_effect_speed_rebuild_map(Scene *scene, Sequence * seq, int force) } /* ********************************************************************** - sequence effect factory - ********************************************************************** */ + * sequence effect factory + * ********************************************************************** */ static void init_noop(struct Sequence *UNUSED(seq)) diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 92199eadf5b..cdb2b5318a4 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3024,14 +3024,14 @@ void seq_tx_handle_xlimits(Sequence *seq, int leftflag, int rightflag) } /* dosnt work now - TODO */ - /* +#if 0 if (seq_tx_get_start(seq) >= seq_tx_get_final_right(seq, 0)) { int ofs; ofs = seq_tx_get_start(seq) - seq_tx_get_final_right(seq, 0); seq->start -= ofs; seq_tx_set_final_left(seq, seq_tx_get_final_left(seq, 0) + ofs ); - }*/ - + } +#endif } } @@ -3061,7 +3061,7 @@ void seq_single_fix(Sequence *seq) return; /* make sure the image is always at the start since there is only one, - adjusting its start should be ok */ + * adjusting its start should be ok */ left = seq_tx_get_final_left(seq, 0); start = seq->start; if (start != left) { @@ -3290,13 +3290,13 @@ 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)); if(seq->type == SEQ_META) { /* if this is the current meta sequence, unmute because - all sequences above this were set to mute */ + * all sequences above this were set to mute */ if(seq == metaseq) seqmute= 0; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 8fef6baa34d..65a01eef175 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3860,16 +3860,16 @@ static void softbody_reset(Object *ob, SoftBody *sb, float (*vertexCos)[3], int bp->vec[0]= bp->vec[1]= bp->vec[2]= 0.0f; /* the bp->prev*'s are for rolling back from a canceled try to propagate in time - adaptive step size algo in a nutshell: - 1. set sheduled time step to new dtime - 2. try to advance the sheduled time step, beeing optimistic execute it - 3. check for success - 3.a we 're fine continue, may be we can increase sheduled time again ?? if so, do so! - 3.b we did exceed error limit --> roll back, shorten the sheduled time and try again at 2. - 4. check if we did reach dtime - 4.a nope we need to do some more at 2. - 4.b yup we're done - */ + * adaptive step size algo in a nutshell: + * 1. set sheduled time step to new dtime + * 2. try to advance the sheduled time step, beeing optimistic execute it + * 3. check for success + * 3.a we 're fine continue, may be we can increase sheduled time again ?? if so, do so! + * 3.b we did exceed error limit --> roll back, shorten the sheduled time and try again at 2. + * 4. check if we did reach dtime + * 4.a nope we need to do some more at 2. + * 4.b yup we're done + */ copy_v3_v3(bp->prevpos, bp->pos); copy_v3_v3(bp->prevvec, bp->vec); @@ -3917,9 +3917,9 @@ static void softbody_step(Scene *scene, Object *ob, SoftBody *sb, float dtime) sst=PIL_check_seconds_timer(); /* Integration back in time is possible in theory, but pretty useless here. - So we refuse to do so. Since we do not know anything about 'outside' canges - especially colliders we refuse to go more than 10 frames. - */ + * So we refuse to do so. Since we do not know anything about 'outside' canges + * especially colliders we refuse to go more than 10 frames. + */ if (dtime < 0 || dtime > 10.5f) return; ccd_update_deflector_hash(scene, ob, sb->scratch->colliderhash); @@ -3938,9 +3938,8 @@ static void softbody_step(Scene *scene, Object *ob, SoftBody *sb, float dtime) float forcetimemax = 1.0f; /* set defaults guess we shall do one frame */ float forcetimemin = 0.01f; /* set defaults guess 1/100 is tight enough */ float timedone =0.0; /* how far did we get without violating error condition */ - /* loops = counter for emergency brake - * we don't want to lock up the system if physics fail - */ + /* loops = counter for emergency brake + * we don't want to lock up the system if physics fail */ int loops = 0; SoftHeunTol = sb->rklimit; /* humm .. this should be calculated from sb parameters and sizes */ diff --git a/source/blender/blenkernel/intern/speaker.c b/source/blender/blenkernel/intern/speaker.c index d2c8a8031ee..a5d24c79bba 100644 --- a/source/blender/blenkernel/intern/speaker.c +++ b/source/blender/blenkernel/intern/speaker.c @@ -83,9 +83,9 @@ void make_local_speaker(Speaker *spk) int is_local= FALSE, is_lib= FALSE; /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if(spk->id.lib==NULL) return; if(spk->id.us==1) { diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 7f67bb27bf6..8d381299ab3 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -2239,7 +2239,7 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm, } /* no need to set shading mode to flat because - * normals are already used to change shading */ + * normals are already used to change shading */ glShadeModel(GL_SMOOTH); for (S=0; S<numVerts; S++) { @@ -2797,7 +2797,7 @@ static int ccgDM_use_grid_pbvh(CCGDerivedMesh *ccgdm) MultiresModifierData *mmd= ccgdm->multires.mmd; /* both of multires and subsurm modifiers are CCG, but - grids should only be used when sculpting on multires */ + * grids should only be used when sculpting on multires */ if(!mmd) return 0; @@ -2822,9 +2822,9 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm) if(ob->sculpt->pbvh) { if(grid_pbvh) { /* pbvh's grids, gridadj and gridfaces points to data inside ccgdm - but this can be freed on ccgdm release, this updates the pointers - when the ccgdm gets remade, the assumption is that the topology - does not change. */ + * but this can be freed on ccgdm release, this updates the pointers + * when the ccgdm gets remade, the assumption is that the topology + * does not change. */ ccgdm_create_grids(dm); BLI_pbvh_grids_update(ob->sculpt->pbvh, ccgdm->gridData, ccgdm->gridAdjacency, (void**)ccgdm->gridFaces); } @@ -2836,8 +2836,8 @@ static struct PBVH *ccgDM_getPBVH(Object *ob, DerivedMesh *dm) return ccgdm->pbvh; /* no pbvh exists yet, we need to create one. only in case of multires - we build a pbvh over the modified mesh, in other cases the base mesh - is being sculpted, so we build a pbvh from that. */ + * we build a pbvh over the modified mesh, in other cases the base mesh + * is being sculpted, so we build a pbvh from that. */ if(grid_pbvh) { ccgdm_create_grids(dm); @@ -3423,7 +3423,7 @@ void subsurf_calculate_limit_positions(Mesh *me, float (*positions_r)[3]) } /* ad-hoc correction for boundary vertices, to at least avoid them - moving completely out of place (brecht) */ + * moving completely out of place (brecht) */ if(numFaces && numFaces != N) mul_v3_fl(face_sum, (float)N/(float)numFaces); diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 8e3ec4766e9..a60ea879954 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -440,11 +440,11 @@ Text *add_text(const char *file, const char *relpath) } /* create new line in cases: - - rest of line (if last line in file hasn't got \n terminator). - in this case content of such line would be used to fill text line buffer - - file is empty. in this case new line is needed to start editing from. - - last characted in buffer is \n. in this case new line is needed to - deal with newline at end of file. (see [#28087]) (sergey) */ + * - rest of line (if last line in file hasn't got \n terminator). + * in this case content of such line would be used to fill text line buffer + * - file is empty. in this case new line is needed to start editing from. + * - last characted in buffer is \n. in this case new line is needed to + * deal with newline at end of file. (see [#28087]) (sergey) */ if (llen!=0 || ta->nlines==0 || buffer[len-1]=='\n') { tmp= (TextLine*) MEM_mallocN(sizeof(TextLine), "textline"); tmp->line= (char*) MEM_mallocN(llen+1, "textline_string"); @@ -3062,8 +3062,8 @@ void txt_add_marker(Text *text, TextLine *line, int start, int end, const unsign } /* Returns the first matching marker on the specified line between two points. - If the group or flags fields are non-zero the returned flag must be in the - specified group and have at least the specified flags set. */ + * If the group or flags fields are non-zero the returned flag must be in the + * specified group and have at least the specified flags set. */ TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int end, int group, int flags) { TextMarker *marker, *next; @@ -3085,8 +3085,8 @@ TextMarker *txt_find_marker_region(Text *text, TextLine *line, int start, int en } /* Clears all markers on the specified line between two points. If the group or - flags fields are non-zero the returned flag must be in the specified group - and have at least the specified flags set. */ + * flags fields are non-zero the returned flag must be in the specified group + * and have at least the specified flags set. */ short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, int group, int flags) { TextMarker *marker, *next; @@ -3111,8 +3111,8 @@ short txt_clear_marker_region(Text *text, TextLine *line, int start, int end, in } /* Clears all markers in the specified group (if given) with at least the - specified flags set. Useful for clearing temporary markers (group=0, - flags=TMARK_TEMP) */ + * specified flags set. Useful for clearing temporary markers (group=0, + * flags=TMARK_TEMP) */ short txt_clear_markers(Text *text, int group, int flags) { TextMarker *marker, *next; @@ -3131,7 +3131,7 @@ short txt_clear_markers(Text *text, int group, int flags) } /* Finds the marker at the specified line and cursor position with at least the - specified flags set in the given group (if non-zero). */ + * specified flags set in the given group (if non-zero). */ TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int group, int flags) { TextMarker *marker; @@ -3150,7 +3150,7 @@ TextMarker *txt_find_marker(Text *text, TextLine *line, int curs, int group, int } /* Finds the previous marker in the same group. If no other is found, the same - marker will be returned */ + * marker will be returned */ TextMarker *txt_prev_marker(Text *text, TextMarker *marker) { TextMarker *tmp= marker; @@ -3164,7 +3164,7 @@ TextMarker *txt_prev_marker(Text *text, TextMarker *marker) } /* Finds the next marker in the same group. If no other is found, the same - marker will be returned */ + * marker will be returned */ TextMarker *txt_next_marker(Text *text, TextMarker *marker) { TextMarker *tmp= marker; diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 4c40dca3365..23a30b6522b 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -911,9 +911,9 @@ void make_local_texture(Tex *tex) int a, is_local= FALSE, is_lib= FALSE; /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if(tex->id.lib==NULL) return; @@ -1157,8 +1157,8 @@ Tex *give_current_material_texture(Material *ma) if(ma && ma->use_nodes && ma->nodetree) { /* first check texture, then material, this works together - with a hack that clears the active ID flag for textures on - making a material node active */ + * with a hack that clears the active ID flag for textures on + * making a material node active */ node= nodeGetActiveID(ma->nodetree, ID_TE); if(node) { diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index 4a509473ac8..35aeb869bdd 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -745,8 +745,8 @@ static void tracks_map_merge(TracksMap *map, MovieTracking *tracking) } /* duplicate currently operating tracks to temporary list. - this is needed to keep names in unique state and it's faster to change names - of currently operating tracks (if needed) */ + * this is needed to keep names in unique state and it's faster to change names + * of currently operating tracks (if needed) */ for(a= 0; a<map->num_tracks; a++) { int replace_sel= 0, replace_rot= 0; MovieTrackingTrack *new_track, *old; @@ -1480,7 +1480,7 @@ int BKE_tracking_next(MovieTrackingContext *context) #pragma omp critical { /* check if there's no keyframe/tracked markers before tracking marker. - if so -- create disabled marker before currently tracking "segment" */ + * if so -- create disabled marker before currently tracking "segment" */ put_disabled_marker(track, marker, !context->backwards, 0); } } @@ -2684,7 +2684,7 @@ ImBuf *BKE_tracking_stabilize(MovieTracking *tracking, int framenr, ImBuf *ibuf, if(tangle==0.0f) { /* if angle is zero, then it's much faster to use rect copy - but could be issues with subpixel precisions */ + * but could be issues with subpixel precisions */ IMB_rectcpy(tmpibuf, ibuf, tloc[0]-(tscale-1.0f)*width/2.0f, tloc[1]-(tscale-1.0f)*height/2.0f, 0, 0, ibuf->x, ibuf->y); } else { float mat[4][4]; diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 9ab91fce302..c3ba8f1ad6a 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -120,10 +120,10 @@ static struct bUnitDef buMetricLenDef[] = { /* These get displayed because of float precision problems in the transform header, * could work around, but for now probably people wont use these */ - /* +#if 0 {"nanometer", "Nanometers", "nm", NULL, 0.000000001, 0.0, B_UNIT_DEF_NONE}, {"picometer", "Picometers", "pm", NULL, 0.000000000001, 0.0,B_UNIT_DEF_NONE}, - */ +#endif {NULL, NULL, NULL, NULL, NULL, 0.0, 0.0} }; static struct bUnitCollection buMetricLenCollecton = {buMetricLenDef, 3, 0, sizeof(buMetricLenDef)/sizeof(bUnitDef)}; diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index b3f1e140829..a4fc4c7bfe3 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -169,9 +169,9 @@ void make_local_world(World *wrld) int is_local= FALSE, is_lib= FALSE; /* - only lib users: do nothing - * - only local users: set flag - * - mixed: make copy - */ + * - only local users: set flag + * - mixed: make copy + */ if(wrld->id.lib==NULL) return; if(wrld->id.us==1) { |