diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 23:40:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 23:40:36 +0400 |
commit | b33f0ef0e3c12fcb57217d1653e60aa957b938fc (patch) | |
tree | a8fc31f587031627ca59a1e842ce05f1096e3e6a /source/blender/blenkernel | |
parent | 295aa880e96602885e43993d3604d9c7330b9084 (diff) |
style cleanup
Diffstat (limited to 'source/blender/blenkernel')
22 files changed, 44 insertions, 44 deletions
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index b66a90ab911..805db8f5171 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1577,7 +1577,7 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, N PropertyRNA *prop; PointerRNA new_ptr; char *path = NULL; - /* short free_path=0; */ + /* short free_path = 0; */ /* sanity checks */ if (channels == NULL) @@ -1585,7 +1585,7 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, ListBase *channels, N /* get RNA pointer+property info from F-Curve for more convenient handling */ /* get path, remapped as appropriate to work in its new environment */ - /* free_path= */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path); + /* free_path = */ /* UNUSED */ animsys_remap_path(strip->remap, fcu->rna_path, &path); /* a valid property must be available, and it must be animatable */ if (RNA_path_resolve(ptr, path, &new_ptr, &prop) == 0) { diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index e6333ed74aa..0def299c24a 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -518,7 +518,7 @@ void BKE_write_undo(bContext *C, const char *name) if ( (U.uiflag & USER_GLOBALUNDO) == 0) return; if (U.undosteps == 0) return; - /* remove all undos after (also when curundo==NULL) */ + /* remove all undos after (also when curundo == NULL) */ while (undobase.last != curundo) { uel = undobase.last; BLI_remlink(&undobase, uel); @@ -564,7 +564,7 @@ void BKE_write_undo(bContext *C, const char *name) BLI_snprintf(numstr, sizeof(numstr), "%d.blend", counter); BLI_make_file_string("/", filepath, BLI_temporary_dir(), numstr); - /* success= */ /* UNUSED */ BLO_write_file(CTX_data_main(C), filepath, fileflags, NULL, NULL); + /* success = */ /* UNUSED */ BLO_write_file(CTX_data_main(C), filepath, fileflags, NULL, NULL); BLI_strncpy(curundo->str, filepath, sizeof(curundo->str)); } @@ -574,7 +574,7 @@ void BKE_write_undo(bContext *C, const char *name) if (curundo->prev) prevfile = &(curundo->prev->memfile); memused = MEM_get_memory_in_use(); - /* success= */ /* UNUSED */ BLO_write_file_mem(CTX_data_main(C), prevfile, &curundo->memfile, G.fileflags); + /* success = */ /* UNUSED */ BLO_write_file_mem(CTX_data_main(C), prevfile, &curundo->memfile, G.fileflags); curundo->undosize = MEM_get_memory_in_use() - memused; } diff --git a/source/blender/blenkernel/intern/bullet.c b/source/blender/blenkernel/intern/bullet.c index 9fcb4389c62..7defa7e1be3 100644 --- a/source/blender/blenkernel/intern/bullet.c +++ b/source/blender/blenkernel/intern/bullet.c @@ -45,7 +45,7 @@ BulletSoftBody *bsbNew(void) { BulletSoftBody *bsb; - bsb= MEM_callocN(sizeof(BulletSoftBody), "bulletsoftbody"); + bsb = MEM_callocN(sizeof(BulletSoftBody), "bulletsoftbody"); bsb->flag = OB_BSB_BENDING_CONSTRAINTS | OB_BSB_SHAPE_MATCHING | OB_BSB_AERO_VPOINT; bsb->linStiff = 0.5f; diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index f6eee44b92c..4e6a4b4a43c 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -927,7 +927,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm, //int actualFace = dm->drawObject->triangle_to_mface[i]; int actualFace = next_actualFace; MFace *mface = mf + actualFace; - /*int drawSmooth= (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mface->flag & ME_SMOOTH);*/ /* UNUSED */ + /*int drawSmooth = (flag & DM_DRAW_ALWAYS_SMOOTH) ? 1 : (mface->flag & ME_SMOOTH);*/ /* UNUSED */ DMDrawOption draw_option = DM_DRAW_OPTION_NORMAL; int flush = 0; @@ -1208,7 +1208,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm, else { /* if the buffer was set, don't use it again. * prevdraw was assumed true but didnt run so set to false - [#21036] */ - /* prevdraw= 0; */ /* UNUSED */ + /* prevdraw = 0; */ /* UNUSED */ buffer = NULL; } } diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 4cdb4e1b66e..3c8f29d8440 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -267,7 +267,7 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res * loops requesting data from ourselfs in a context callback */ /* Ok, this looks evil... - * if (ret) done= -(-ret | -done); + * if (ret) done = -(-ret | -done); * * Values in order of importance * (0, -1, 1) - Where 1 is highest priority diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 2b08c085417..a6ce5daf247 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -2938,7 +2938,7 @@ void DAG_pose_sort(Object *ob) queue_delete(nqueue); // printf("\nordered\n"); -// for (pchan = pose->chanbase.first; pchan; pchan= pchan->next) { +// for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) { // printf(" %s\n", pchan->name); // } diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index e0c3b257273..335758fec11 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -594,7 +594,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, float (*vertexCos)[3] = bmdm->vertexCos; float (*vertexNos)[3] = bmdm->vertexNos; float (*polyNos)[3] = bmdm->polyNos; - // int *triPolyMap= bmdm->triPolyMap; + // int *triPolyMap = bmdm->triPolyMap; BM_mesh_elem_index_ensure(bmdm->tc->bm, BM_VERT | BM_FACE); @@ -802,7 +802,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm, BMLoop **ls = em->looptris[i]; MTexPoly *tp = has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL; MTFace mtf = {{{0}}}; - /*unsigned char *cp= NULL;*/ /*UNUSED*/ + /*unsigned char *cp = NULL;*/ /*UNUSED*/ int drawSmooth = BM_elem_flag_test(ls[0]->f, BM_ELEM_SMOOTH); DMDrawOption draw_option; @@ -874,7 +874,7 @@ static void emDM_drawFacesTex_common(DerivedMesh *dm, BMLoop **ls = em->looptris[i]; MTexPoly *tp = has_uv ? CustomData_bmesh_get(&bm->pdata, ls[0]->f->head.data, CD_MTEXPOLY) : NULL; MTFace mtf = {{{0}}}; - /*unsigned char *cp= NULL;*/ /*UNUSED*/ + /*unsigned char *cp = NULL;*/ /*UNUSED*/ int drawSmooth = BM_elem_flag_test(ls[0]->f, BM_ELEM_SMOOTH); DMDrawOption draw_option; diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index 59c8a529d85..b7ede15d00b 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -613,7 +613,7 @@ static float fcm_cycles_time(FCurve *fcu, FModifier *fcm, float UNUSED(cvalue), /* check that cyclic is still enabled for the specified time */ if (cycles == 0) { - /* catch this case so that we don't exit when we have cycles=0 + /* catch this case so that we don't exit when we have (cycles = 0) * as this indicates infinite cycles... */ } @@ -810,7 +810,7 @@ static void fcm_python_copy(FModifier *fcm, FModifier *src) static void fcm_python_evaluate(FCurve *UNUSED(fcu), FModifier *UNUSED(fcm), float *UNUSED(cvalue), float UNUSED(evaltime)) { #ifdef WITH_PYTHON - //FMod_Python *data= (FMod_Python *)fcm->data; + //FMod_Python *data = (FMod_Python *)fcm->data; /* FIXME... need to implement this modifier... * It will need it execute a script using the custom properties diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index 8f077ab107c..0725b1732d3 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -196,7 +196,7 @@ int add_to_group(Group *group, Object *object, Scene *scene, Base *base) } } -/* also used for ob==NULL */ +/* also used for (ob == NULL) */ static int rem_from_group_internal(Group *group, Object *ob) { GroupObject *go, *gon; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 80b192c7a42..a2b1fb10500 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -290,7 +290,7 @@ static void image_assign_ibuf(Image *ima, ImBuf *ibuf, int index, int frame) else ibuf->flags &= ~IB_cm_predivide; - /* this function accepts link==NULL */ + /* this function accepts (link == NULL) */ BLI_insertlinkbefore(&ima->ibufs, link, ibuf); /* now we don't want copies? */ @@ -802,7 +802,7 @@ void BKE_image_free_all_textures(void) { Tex *tex; Image *ima; - /* unsigned int totsize= 0; */ + /* unsigned int totsize = 0; */ for (ima = G.main->image.first; ima; ima = ima->id.next) ima->id.flag &= ~LIB_DOIT; diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 15db290ff14..e3495a15871 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -305,7 +305,7 @@ void init_latt_deform(Object *oblatt, Object *ob) fp = lt->latticedata = MEM_mallocN(sizeof(float) * 3 * lt->pntsu * lt->pntsv * lt->pntsw, "latticedata"); - /* for example with a particle system: ob==0 */ + /* for example with a particle system: (ob == NULL) */ if (ob == NULL) { /* in deformspace, calc matrix */ invert_m4_m4(lt->latmat, oblatt->obmat); diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 26516b62aa3..de67119d850 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -645,7 +645,7 @@ static ID *alloc_libblock_notest(short type) id = MEM_callocN(sizeof(Text), "text"); break; case ID_SCRIPT: - //XXX id= MEM_callocN(sizeof(Script), "script"); + //XXX id = MEM_callocN(sizeof(Script), "script"); break; case ID_SPK: id = MEM_callocN(sizeof(Speaker), "speaker"); @@ -1032,7 +1032,7 @@ static void IDnames_to_dyn_pupstring(DynStr *pupds, ListBase *lb, ID *link, shor /* used by headerbuttons.c buttons.c editobject.c editseq.c */ -/* if nr==NULL no MAX_IDPUP, this for non-header browsing */ +/* if (nr == NULL) no MAX_IDPUP, this for non-header browsing */ void IDnames_to_pupstring(const char **str, const char *title, const char *extraops, ListBase *lb, ID *link, short *nr) { DynStr *pupds = BLI_dynstr_new(); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 0eeb16be699..55ae7e4d11a 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -607,7 +607,7 @@ Material *give_current_material(Object *ob, short act) if (ob == NULL) return NULL; - /* if object cannot have material, totcolp==NULL */ + /* if object cannot have material, (totcolp == NULL) */ totcolp = give_totcolp(ob); if (totcolp == NULL || ob->totcol == 0) return NULL; @@ -1179,7 +1179,7 @@ int object_remove_material_slot(Object *ob) } -/* r_col = current value, col = new value, fac==0 is no change */ +/* r_col = current value, col = new value, (fac == 0) is no change */ void ramp_blend(int type, float r_col[3], const float fac, const float col[3]) { float tmp, facm = 1.0f - fac; diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index bef5f2e18a3..b5b03a8924f 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -816,7 +816,7 @@ static int totindex, curindex; static void accum_mballfaces(int i1, int i2, int i3, int i4) { int *newi, *cur; - /* static int i=0; I would like to delete altogether, but I don't dare to, yet */ + /* static int i = 0; I would like to delete altogether, but I don't dare to, yet */ if (totindex == curindex) { totindex += 256; @@ -1701,7 +1701,7 @@ static float init_meta(Scene *scene, Object *ob) /* return totsize */ MetaBall *mb; MetaElem *ml; float size, totsize, obinv[4][4], obmat[4][4], vec[3]; - //float max=0.0; + //float max = 0.0f; int a, obnr, zero_size = 0; char obname[MAX_ID_NAME]; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 9eb74986b29..fd952b7b518 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1823,7 +1823,7 @@ void BKE_mesh_calc_normals_mapping_ex(MVert *mverts, int numVerts, } if (origIndexFace && - /* fnors==faceNors_r */ /* NO NEED TO ALLOC YET */ + /* fnors == faceNors_r */ /* NO NEED TO ALLOC YET */ fnors != NULL && numFaces) { @@ -2004,7 +2004,7 @@ 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. */ + * If (corners == 0) for a non-empty layer though, something went wrong. */ BLI_assert(fd->totdisp == 0); } else { diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 4e8b67bd55b..d818ca09f20 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -685,7 +685,7 @@ static void multires_del_higher(MultiresModifierData *mmd, Object *ob, int lvl) multires_set_tot_level(ob, mmd, lvl); } -/* direction=1 for delete higher, direction=0 for lower (not implemented yet) */ +/* (direction = 1) for delete higher, (direction = 0) for lower (not implemented yet) */ void multiresModifier_del_levels(MultiresModifierData *mmd, Object *ob, int direction) { Mesh *me = BKE_mesh_from_object(ob); diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index cd5efb9951b..9537a31838c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2411,7 +2411,7 @@ static void get_strand_normal(Material *ma, const float surfnor[3], float surfdi static int psys_threads_init_path(ParticleThread *threads, Scene *scene, float cfra, int editupdate) { ParticleThreadContext *ctx = threads[0].ctx; -/* Object *ob= ctx->sim.ob; */ +/* Object *ob = ctx->sim.ob; */ ParticleSystem *psys = ctx->sim.psys; ParticleSettings *part = psys->part; /* ParticleEditSettings *pset = &scene->toolsettings->particle; */ diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index f2b963a7edb..63efd194932 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -604,7 +604,7 @@ void BKE_scene_set_background(Main *bmain, Scene *scene) base->flag |= flag; /* not too nice... for recovering objects with lost data */ - //if (ob->pose==NULL) base->flag &= ~OB_POSEMODE; + //if (ob->pose == NULL) base->flag &= ~OB_POSEMODE; ob->flag = base->flag; ob->ctime = -1234567.0; /* force ipo to be calculated later */ diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 915f5557925..252ddb78887 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -143,7 +143,7 @@ static void open_plugin_seq(PluginSeq *pis, const char *seqname) BLI_dynlib_get_error_as_string(NULL); /* if (pis->handle) BLI_dynlib_close(pis->handle); */ - /* pis->handle= 0; */ + /* pis->handle = 0; */ /* open the needed object */ pis->handle = BLI_dynlib_open(pis->name); @@ -1480,8 +1480,8 @@ static void do_mul_effect_byte(float facf0, float facf1, int x, int y, fac3 = (int)(256.0f * facf1); /* formula: - * fac*(a*b) + (1-fac)*a => fac*a*(b-1)+axaux= c*px + py*s ;//+centx - * yaux= -s*px + c*py;//+centy + * fac * (a * b) + (1-fac)*a => fac * a * (b - 1) + axaux = c * px + py * s; //+centx + * yaux = -s * px + c * py; //+centy */ while (y--) { @@ -2339,7 +2339,7 @@ static void RVBlurBitmap2_byte(unsigned char *map, int width, int height, /* Swap buffers */ - swap = temp; temp = map; /* map=swap; */ /* UNUSED */ + swap = temp; temp = map; /* map = swap; */ /* UNUSED */ /* Tidy up */ MEM_freeN(filter); @@ -2509,7 +2509,7 @@ static void RVBlurBitmap2_float(float *map, int width, int height, /* Swap buffers */ - swap = temp; temp = map; /* map=swap; */ /* UNUSED */ + swap = temp; temp = map; /* map = swap; */ /* UNUSED */ /* Tidy up */ MEM_freeN(filter); diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 8fbb3ee9800..8cb8a5a1bf1 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -612,8 +612,8 @@ void calc_sequence(Scene *scene, Sequence *seq) /* we take the largest start and smallest end */ - // seq->start= seq->startdisp= MAX2(seq->seq1->startdisp, seq->seq2->startdisp); - // seq->enddisp= MIN2(seq->seq1->enddisp, seq->seq2->enddisp); + // seq->start = seq->startdisp = MAX2(seq->seq1->startdisp, seq->seq2->startdisp); + // seq->enddisp = MIN2(seq->seq1->enddisp, seq->seq2->enddisp); if (seq->seq1) { /* XXX These resets should not be necessary, but users used to be able to diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 22e702d5930..5c387e8cee0 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -125,7 +125,7 @@ static CCGSubSurf *_getSubSurf(CCGSubSurf *prevSS, int subdivLevels, int useArena = flags & CCG_USE_ARENA; int normalOffset = 0; - /* subdivLevels==0 is not allowed */ + /* (subdivLevels == 0) is not allowed */ subdivLevels = MAX2(subdivLevels, 1); if (prevSS) { diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 7bfd4189cc3..eefdb31c001 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -813,7 +813,7 @@ void txt_move_up(Text *text, short sel) if (sel) txt_curs_sel(text, &linep, &charp); else { txt_pop_first(text); txt_curs_cur(text, &linep, &charp); } if (!*linep) return; - /* old= *charp; */ /* UNUSED */ + /* old = *charp; */ /* UNUSED */ if ((*linep)->prev) { int index = txt_utf8_offset_to_index((*linep)->line, *charp); @@ -841,7 +841,7 @@ void txt_move_down(Text *text, short sel) if (sel) txt_curs_sel(text, &linep, &charp); else { txt_pop_last(text); txt_curs_cur(text, &linep, &charp); } if (!*linep) return; - /* old= *charp; */ /* UNUSED */ + /* old = *charp; */ /* UNUSED */ if ((*linep)->next) { int index = txt_utf8_offset_to_index((*linep)->line, *charp); @@ -3226,8 +3226,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; @@ -3276,7 +3276,7 @@ TextMarker *txt_prev_marker(Text *text, TextMarker *marker) if (tmp->group == marker->group) return tmp; } - return NULL; /* Only if marker==NULL */ + return NULL; /* Only if (marker == NULL) */ } /* Finds the next marker in the same group. If no other is found, the same @@ -3290,7 +3290,7 @@ TextMarker *txt_next_marker(Text *text, TextMarker *marker) if (tmp->group == marker->group) return tmp; } - return NULL; /* Only if marker==NULL */ + return NULL; /* Only if (marker == NULL) */ } |