diff options
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/armature_update.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 15 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/fmodifier.c | 30 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/ipo.c | 81 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mask_evaluate.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mask_rasterize.c | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_evaluate.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 21 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 80 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 97 |
16 files changed, 271 insertions, 176 deletions
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c index 6d51c7f5108..917d29a9bbf 100644 --- a/source/blender/blenkernel/intern/armature_update.c +++ b/source/blender/blenkernel/intern/armature_update.c @@ -869,8 +869,7 @@ void BKE_pose_eval_proxy_copy_bone(struct Depsgraph *depsgraph, Object *object, * around for the time while proxies are evaluating. */ #if 0 - bPoseChannel *pchan_from = pose_pchan_get_indexed( - object->proxy_from, pchan_index); + bPoseChannel *pchan_from = pose_pchan_get_indexed(object->proxy_from, pchan_index); #else bPoseChannel *pchan_from = BKE_pose_channel_find_name(object->proxy_from->pose, pchan->name); #endif diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index ada746d3fcc..debdedabadb 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1149,9 +1149,10 @@ void CDDM_calc_normals_mapping(DerivedMesh *dm) void CDDM_calc_normals(DerivedMesh *dm) { CDDerivedMesh *cddm = (CDDerivedMesh *)dm; - float (*poly_nors)[3]; + float(*poly_nors)[3]; - if (dm->numVertData == 0) return; + if (dm->numVertData == 0) + return; /* we don't want to overwrite any referenced layers */ cddm->mvert = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, dm->numVertData); @@ -1162,8 +1163,14 @@ void CDDM_calc_normals(DerivedMesh *dm) poly_nors = CustomData_add_layer(&dm->polyData, CD_NORMAL, CD_CALLOC, NULL, dm->numPolyData); } - BKE_mesh_calc_normals_poly(cddm->mvert, dm->numVertData, CDDM_get_loops(dm), CDDM_get_polys(dm), - dm->numLoopData, dm->numPolyData, poly_nors, false); + BKE_mesh_calc_normals_poly(cddm->mvert, + dm->numVertData, + CDDM_get_loops(dm), + CDDM_get_polys(dm), + dm->numLoopData, + dm->numPolyData, + poly_nors, + false); cddm->dm.dirty &= ~DM_DIRTY_NORMALS; } diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 114bf5ec1e6..01dc7c6b3ad 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -665,18 +665,18 @@ static void constraint_target_to_mat4(Object *ob, */ #if 0 static bConstraintTypeInfo CTI_CONSTRNAME = { - CONSTRAINT_TYPE_CONSTRNAME, /* type */ - sizeof(bConstrNameConstraint), /* size */ - "ConstrName", /* name */ - "bConstrNameConstraint", /* struct name */ - constrname_free, /* free data */ - constrname_id_looper, /* id looper */ - constrname_copy, /* copy data */ - constrname_new_data, /* new data */ - constrname_get_tars, /* get constraint targets */ - constrname_flush_tars, /* flush constraint targets */ - constrname_get_tarmat, /* get target matrix */ - constrname_evaluate, /* evaluate */ + CONSTRAINT_TYPE_CONSTRNAME, /* type */ + sizeof(bConstrNameConstraint), /* size */ + "ConstrName", /* name */ + "bConstrNameConstraint", /* struct name */ + constrname_free, /* free data */ + constrname_id_looper, /* id looper */ + constrname_copy, /* copy data */ + constrname_new_data, /* new data */ + constrname_get_tars, /* get constraint targets */ + constrname_flush_tars, /* flush constraint targets */ + constrname_get_tarmat, /* get target matrix */ + constrname_evaluate, /* evaluate */ }; #endif diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 7bbdfa6c52d..2d4f1607fe4 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -3064,10 +3064,18 @@ int dynamicPaint_createUVSurface(Scene *scene, if (tempPoints[index].tri_index != -1) { int nidx = tempPoints[index].neighbour_pixel; - fprintf(dump_file, "%d\t%d,%d\t%u\t%d,%d\t%d\t", fidx, tx, h-1-ty, tempPoints[index].tri_index, nidx<0?-1:(nidx%w), nidx<0?-1:h-1-(nidx/w), ed->flags[fidx]); + fprintf(dump_file, + "%d\t%d,%d\t%u\t%d,%d\t%d\t", + fidx, + tx, + h - 1 - ty, + tempPoints[index].tri_index, + nidx < 0 ? -1 : (nidx % w), + nidx < 0 ? -1 : h - 1 - (nidx / w), + ed->flags[fidx]); for (int i = 0; i < ed->n_num[fidx]; i++) { - int tgt = tmp[ed->n_target[ed->n_index[fidx]+i]]; - fprintf(dump_file, "%s%d,%d", i?" ":"", tgt%w, h-1-tgt/w); + int tgt = tmp[ed->n_target[ed->n_index[fidx] + i]]; + fprintf(dump_file, "%s%d,%d", i ? " " : "", tgt % w, h - 1 - tgt / w); } fprintf(dump_file, "\n"); } diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index d54a3bdaa37..3cecfb8aa17 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -79,21 +79,21 @@ void *fmodifiers_storage_get(FModifierStackStorage *storage, FModifier *fcm); */ #if 0 static FModifierTypeInfo FMI_MODNAME = { - FMODIFIER_TYPE_MODNAME, /* type */ - sizeof(FMod_ModName), /* size */ - FMI_TYPE_SOME_ACTION, /* action type */ - FMI_REQUIRES_SOME_REQUIREMENT, /* requirements */ - "Modifier Name", /* name */ - "FMod_ModName", /* struct name */ - fcm_modname_free, /* free data */ - fcm_modname_relink, /* relink data */ - fcm_modname_copy, /* copy data */ - fcm_modname_new_data, /* new data */ - fcm_modname_verify, /* verify */ - fcm_modname_time, /* evaluate time */ - fcm_modname_evaluate, /* evaluate */ - fcm_modname_time_storage, /* evaluate time with storage */ - fcm_modname_evaluate_storage, /* evaluate with storage */ + FMODIFIER_TYPE_MODNAME, /* type */ + sizeof(FMod_ModName), /* size */ + FMI_TYPE_SOME_ACTION, /* action type */ + FMI_REQUIRES_SOME_REQUIREMENT, /* requirements */ + "Modifier Name", /* name */ + "FMod_ModName", /* struct name */ + fcm_modname_free, /* free data */ + fcm_modname_relink, /* relink data */ + fcm_modname_copy, /* copy data */ + fcm_modname_new_data, /* new data */ + fcm_modname_verify, /* verify */ + fcm_modname_time, /* evaluate time */ + fcm_modname_evaluate, /* evaluate */ + fcm_modname_time_storage, /* evaluate time with storage */ + fcm_modname_evaluate_storage, /* evaluate with storage */ }; #endif diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 8f3b1fed692..c2c8fb78a32 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -235,22 +235,28 @@ static const char *ob_adrcodes_to_paths(int adrcode, int *array_index) return "color"; #if 0 case OB_PD_FSTR: - if (ob->pd) poin = &(ob->pd->f_strength); + if (ob->pd) + poin = &(ob->pd->f_strength); break; case OB_PD_FFALL: - if (ob->pd) poin = &(ob->pd->f_power); + if (ob->pd) + poin = &(ob->pd->f_power); break; case OB_PD_SDAMP: - if (ob->pd) poin = &(ob->pd->pdef_damp); + if (ob->pd) + poin = &(ob->pd->pdef_damp); break; case OB_PD_RDAMP: - if (ob->pd) poin = &(ob->pd->pdef_rdamp); + if (ob->pd) + poin = &(ob->pd->pdef_rdamp); break; case OB_PD_PERM: - if (ob->pd) poin = &(ob->pd->pdef_perm); + if (ob->pd) + poin = &(ob->pd->pdef_perm); break; case OB_PD_FMAXD: - if (ob->pd) poin = &(ob->pd->maxdist); + if (ob->pd) + poin = &(ob->pd->maxdist); break; #endif } @@ -414,31 +420,44 @@ static const char *mtex_adrcodes_to_paths(int adrcode, int *UNUSED(array_index)) switch (adrcode) { #if 0 // XXX these are not wrapped in RNA yet! case MAP_OFS_X: - poin = &(mtex->ofs[0]); break; + poin = &(mtex->ofs[0]); + break; case MAP_OFS_Y: - poin = &(mtex->ofs[1]); break; + poin = &(mtex->ofs[1]); + break; case MAP_OFS_Z: - poin = &(mtex->ofs[2]); break; + poin = &(mtex->ofs[2]); + break; case MAP_SIZE_X: - poin = &(mtex->size[0]); break; + poin = &(mtex->size[0]); + break; case MAP_SIZE_Y: - poin = &(mtex->size[1]); break; + poin = &(mtex->size[1]); + break; case MAP_SIZE_Z: - poin = &(mtex->size[2]); break; + poin = &(mtex->size[2]); + break; case MAP_R: - poin = &(mtex->r); break; + poin = &(mtex->r); + break; case MAP_G: - poin = &(mtex->g); break; + poin = &(mtex->g); + break; case MAP_B: - poin = &(mtex->b); break; + poin = &(mtex->b); + break; case MAP_DVAR: - poin = &(mtex->def_var); break; + poin = &(mtex->def_var); + break; case MAP_COLF: - poin = &(mtex->colfac); break; + poin = &(mtex->colfac); + break; case MAP_NORF: - poin = &(mtex->norfac); break; + poin = &(mtex->norfac); + break; case MAP_VARF: - poin = &(mtex->varfac); break; + poin = &(mtex->varfac); + break; #endif case MAP_DISP: prop = "warp_factor"; @@ -659,9 +678,11 @@ static const char *camera_adrcodes_to_paths(int adrcode, int *array_index) #if 0 // XXX these are not defined in RNA case CAM_YF_APERT: - poin = &(ca->YF_aperture); break; + poin = &(ca->YF_aperture); + break; case CAM_YF_FDIST: - poin = &(ca->dof_distance); break; + poin = &(ca->dof_distance); + break; #endif // XXX these are not defined in RNA case CAM_SHIFT_X: @@ -837,22 +858,28 @@ static const char *particle_adrcodes_to_paths(int adrcode, int *array_index) * as the similar object forces */ #if 0 case PART_PD_FSTR: - if (part->pd) poin = &(part->pd->f_strength); + if (part->pd) + poin = &(part->pd->f_strength); break; case PART_PD_FFALL: - if (part->pd) poin = &(part->pd->f_power); + if (part->pd) + poin = &(part->pd->f_power); break; case PART_PD_FMAXD: - if (part->pd) poin = &(part->pd->maxdist); + if (part->pd) + poin = &(part->pd->maxdist); break; case PART_PD2_FSTR: - if (part->pd2) poin = &(part->pd2->f_strength); + if (part->pd2) + poin = &(part->pd2->f_strength); break; case PART_PD2_FFALL: - if (part->pd2) poin = &(part->pd2->f_power); + if (part->pd2) + poin = &(part->pd2->f_power); break; case PART_PD2_FMAXD: - if (part->pd2) poin = &(part->pd2->maxdist); + if (part->pd2) + poin = &(part->pd2->maxdist); break; #endif } diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 7152c9786fb..a87f8a4969a 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -1240,10 +1240,16 @@ static int foreach_libblock_id_users_callback(void *user_data, if (*id_p == iter->id) { #if 0 - printf("%s uses %s (refcounted: %d, userone: %d, used_one: %d, used_one_active: %d, indirect_usage: %d)\n", - iter->curr_id->name, iter->id->name, (cb_flag & IDWALK_USER) ? 1 : 0, (cb_flag & IDWALK_USER_ONE) ? 1 : 0, - (iter->id->tag & LIB_TAG_EXTRAUSER) ? 1 : 0, (iter->id->tag & LIB_TAG_EXTRAUSER_SET) ? 1 : 0, - (cb_flag & IDWALK_INDIRECT_USAGE) ? 1 : 0); + printf( + "%s uses %s (refcounted: %d, userone: %d, used_one: %d, used_one_active: %d, " + "indirect_usage: %d)\n", + iter->curr_id->name, + iter->id->name, + (cb_flag & IDWALK_USER) ? 1 : 0, + (cb_flag & IDWALK_USER_ONE) ? 1 : 0, + (iter->id->tag & LIB_TAG_EXTRAUSER) ? 1 : 0, + (iter->id->tag & LIB_TAG_EXTRAUSER_SET) ? 1 : 0, + (cb_flag & IDWALK_INDIRECT_USAGE) ? 1 : 0); #endif if (cb_flag & IDWALK_CB_INDIRECT_USAGE) { iter->count_indirect++; diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index 2b84c1f32c1..d3e43a60565 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -879,7 +879,8 @@ void BKE_mask_layer_evaluate_animation(MaskLayer *masklay, const float ctime) __func__, (int)ctime, BLI_listbase_count(&masklay->splines_shapes), - masklay_shape_a->frame, masklay_shape_b->frame); + masklay_shape_a->frame, + masklay_shape_b->frame); #endif BKE_mask_layer_shape_to_mask_interp( masklay, masklay_shape_a, masklay_shape_b, (ctime - masklay_shape_a->frame) / w); diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 24137b680ba..0f5fd89d833 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -1212,7 +1212,9 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, /* 2D ray test */ #if 0 static float maskrasterize_layer_z_depth_tri(const float pt[2], - const float v1[3], const float v2[3], const float v3[3]) + const float v1[3], + const float v2[3], + const float v3[3]) { float w[3]; barycentric_weights_v2(v1, v2, v3, pt, w); @@ -1240,10 +1242,7 @@ static float maskrasterize_layer_isect(unsigned int *face, #if 0 /* not essential but avoids unneeded extra lookups */ - if ((cos[0][2] < dist_orig) || - (cos[1][2] < dist_orig) || - (cos[2][2] < dist_orig)) - { + if ((cos[0][2] < dist_orig) || (cos[1][2] < dist_orig) || (cos[2][2] < dist_orig)) { if (isect_point_tri_v2_cw(xy, cos[face[0]], cos[face[1]], cos[face[2]])) { /* we know all tris are close for now */ return maskrasterize_layer_z_depth_tri(xy, cos[face[0]], cos[face[1]], cos[face[2]]); diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index 2ef1a009321..3982339d501 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -1119,7 +1119,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli MLoopNorSpace *lnor_space = data->lnor_space; #if 0 /* Not needed for 'fan' loops. */ - float (*lnor)[3] = data->lnor; + float(*lnor)[3] = data->lnor; #endif const MLoop *ml_curr = data->ml_curr; const MLoop *ml_prev = data->ml_prev; @@ -1537,7 +1537,7 @@ static void loop_split_generator(TaskPool *pool, LoopSplitTaskDataCommon *common data->ml_curr_index = ml_curr_index; #if 0 /* Not needed for 'single' loop. */ data->ml_prev_index = ml_prev_index; - data->e2l_prev = NULL; /* Tag as 'single' task. */ + data->e2l_prev = NULL; /* Tag as 'single' task. */ #endif data->mp_index = mp_index; if (lnors_spacearr) { diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index c007d5e3df7..40172a4778c 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -431,7 +431,6 @@ static int pbvh_bmesh_node_offset_from_elem(PBVH *bvh, BMElem *ele) BLI_assert(ele->head.htype == BM_FACE); return bvh->cd_face_node_offset; } - } static int pbvh_bmesh_node_index_from_elem(PBVH *bvh, void *key) @@ -543,7 +542,7 @@ static int pbvh_bmesh_node_vert_use_count(PBVH *bvh, PBVHNode *node, BMVert *v) BMFace *f; int count = 0; - BM_FACES_OF_VERT_ITER_BEGIN(f, v) { + BM_FACES_OF_VERT_ITER_BEGIN (f, v) { PBVHNode *f_node = pbvh_bmesh_node_from_face(bvh, f); if (f_node == node) { count++; @@ -2105,18 +2104,14 @@ static void pbvh_bmesh_print(PBVH *bvh) BMIter iter; BMFace *f; - BM_ITER_MESH(f, &iter, bvh->bm, BM_FACES_OF_MESH) { - fprintf(stderr, " %d -> %d\n", - BM_elem_index_get(f), - pbvh_bmesh_node_index_from_face(bvh, f)); + BM_ITER_MESH (f, &iter, bvh->bm, BM_FACES_OF_MESH) { + fprintf(stderr, " %d -> %d\n", BM_elem_index_get(f), pbvh_bmesh_node_index_from_face(bvh, f)); } fprintf(stderr, "bm_vert_to_node:\n"); BMVert *v; - BM_ITER_MESH(v, &iter, bvh->bm, BM_FACES_OF_MESH) { - fprintf(stderr, " %d -> %d\n", - BM_elem_index_get(v), - pbvh_bmesh_node_index_from_vert(bvh, v)); + BM_ITER_MESH (v, &iter, bvh->bm, BM_FACES_OF_MESH) { + fprintf(stderr, " %d -> %d\n", BM_elem_index_get(v), pbvh_bmesh_node_index_from_vert(bvh, v)); } for (int n = 0; n < bvh->totnode; n++) { @@ -2127,16 +2122,13 @@ static void pbvh_bmesh_print(PBVH *bvh) GSetIterator gs_iter; fprintf(stderr, "node %d\n faces:\n", n); GSET_ITER (gs_iter, node->bm_faces) - fprintf(stderr, " %d\n", - BM_elem_index_get((BMFace *)BLI_gsetIterator_getKey(&gs_iter))); + fprintf(stderr, " %d\n", BM_elem_index_get((BMFace *)BLI_gsetIterator_getKey(&gs_iter))); fprintf(stderr, " unique verts:\n"); GSET_ITER (gs_iter, node->bm_unique_verts) - fprintf(stderr, " %d\n", - BM_elem_index_get((BMVert *)BLI_gsetIterator_getKey(&gs_iter))); + fprintf(stderr, " %d\n", BM_elem_index_get((BMVert *)BLI_gsetIterator_getKey(&gs_iter))); fprintf(stderr, " other verts:\n"); GSET_ITER (gs_iter, node->bm_other_verts) - fprintf(stderr, " %d\n", - BM_elem_index_get((BMVert *)BLI_gsetIterator_getKey(&gs_iter))); + fprintf(stderr, " %d\n", BM_elem_index_get((BMVert *)BLI_gsetIterator_getKey(&gs_iter))); } } diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 2d3914090b1..1d0764d1f94 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1838,9 +1838,7 @@ static bool foreach_object_particle_ptcache(Object *object, } /* Hair needs to be included in id-list for cache edit mode to work. */ #if 0 - if ((psys->part->type == PART_HAIR) && - (psys->flag & PSYS_HAIR_DYNAMICS) == 0) - { + if ((psys->part->type == PART_HAIR) && (psys->flag & PSYS_HAIR_DYNAMICS) == 0) { continue; } #endif diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 4af06606ef0..4f50dde4bdb 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -121,12 +121,23 @@ SequencerDrawView sequencer_view3d_cb = NULL; /* NULL in background mode */ #if 0 /* unused function */ static void printf_strip(Sequence *seq) { - fprintf(stderr, "name: '%s', len:%d, start:%d, (startofs:%d, endofs:%d), " + fprintf(stderr, + "name: '%s', len:%d, start:%d, (startofs:%d, endofs:%d), " "(startstill:%d, endstill:%d), machine:%d, (startdisp:%d, enddisp:%d)\n", - seq->name, seq->len, seq->start, seq->startofs, seq->endofs, seq->startstill, seq->endstill, seq->machine, - seq->startdisp, seq->enddisp); - - fprintf(stderr, "\tseq_tx_set_final_left: %d %d\n\n", seq_tx_get_final_left(seq, 0), + seq->name, + seq->len, + seq->start, + seq->startofs, + seq->endofs, + seq->startstill, + seq->endstill, + seq->machine, + seq->startdisp, + seq->enddisp); + + fprintf(stderr, + "\tseq_tx_set_final_left: %d %d\n\n", + seq_tx_get_final_left(seq, 0), seq_tx_get_final_right(seq, 0)); } #endif diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index ba7e26e817a..65ad1c483c3 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1804,35 +1804,36 @@ static void dfdx_spring(int ia, int ic, int op, float dir[3], float L, float len float m, delta_ij; int i, j; if (L < len) { - for (i=0;i<3;i++) { - for (j=0;j<3;j++) { - delta_ij = (i==j ? (1.0f): (0.0f)); - m=factor*(dir[i]*dir[j] + (1-L/len)*(delta_ij - dir[i]*dir[j])); - EIG_linear_solver_matrix_add(ia+i, op+ic+j, m); + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + delta_ij = (i == j ? (1.0f) : (0.0f)); + m = factor * (dir[i] * dir[j] + (1 - L / len) * (delta_ij - dir[i] * dir[j])); + EIG_linear_solver_matrix_add(ia + i, op + ic + j, m); } } } else { - for (i=0;i<3;i++) { - for (j=0;j<3;j++) { - m=factor*dir[i]*dir[j]; - EIG_linear_solver_matrix_add(ia+i, op+ic+j, m); + for (i = 0; i < 3; i++) { + for (j = 0; j < 3; j++) { + m = factor * dir[i] * dir[j]; + EIG_linear_solver_matrix_add(ia + i, op + ic + j, m); } } } } - static void dfdx_goal(int ia, int ic, int op, float factor) { int i; - for (i=0;i<3;i++) EIG_linear_solver_matrix_add(ia+i, op+ic+i, factor); + for (i = 0; i < 3; i++) + EIG_linear_solver_matrix_add(ia + i, op + ic + i, factor); } static void dfdv_goal(int ia, int ic, float factor) { int i; - for (i=0;i<3;i++) EIG_linear_solver_matrix_add(ia+i, ic+i, factor); + for (i = 0; i < 3; i++) + EIG_linear_solver_matrix_add(ia + i, ic + i, factor); } #endif /* if 0 */ @@ -1852,16 +1853,16 @@ static void sb_spring_force( bp1 = &sb->bpoint[bs->v1]; bp2 = &sb->bpoint[bs->v2]; #if 0 /* UNUSED */ - ia =3*bs->v1; - ic =3*bs->v2; + ia = 3 * bs->v1; + ic = 3 * bs->v2; #endif } else if (bpi == bs->v2) { bp1 = &sb->bpoint[bs->v2]; bp2 = &sb->bpoint[bs->v1]; #if 0 /* UNUSED */ - ia =3*bs->v2; - ic =3*bs->v1; + ia = 3 * bs->v2; + ic = 3 * bs->v1; #endif } else { @@ -2284,8 +2285,10 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float * /* old one with homogeneous masses */ /* claim a minimum mass for vertex */ #if 0 - if (sb->nodemass > 0.009999f) timeovermass = forcetime / sb->nodemass; - else timeovermass = forcetime / 0.009999f; + if (sb->nodemass > 0.009999f) + timeovermass = forcetime / sb->nodemass; + else + timeovermass = forcetime / 0.009999f; #endif for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) { @@ -2339,11 +2342,11 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float * /* the freezer coming sooner or later */ #if 0 - if ((dot_v3v3(dx, dx)<freezeloc )&&(dot_v3v3(bp->force, bp->force)<freezeforce )) { - bp->frozen /=2; + if ((dot_v3v3(dx, dx) < freezeloc) && (dot_v3v3(bp->force, bp->force) < freezeforce)) { + bp->frozen /= 2; } else { - bp->frozen = min_ff(bp->frozen*1.05f, 1.0f); + bp->frozen = min_ff(bp->frozen * 1.05f, 1.0f); } mul_v3_fl(dx, bp->frozen); #endif @@ -2417,73 +2420,72 @@ static void softbody_restore_prev_step(Object *ob) #if 0 static void softbody_store_step(Object *ob) { - SoftBody *sb= ob->soft; /* is supposed to be there*/ + SoftBody *sb = ob->soft; /* is supposed to be there*/ BodyPoint *bp; int a; - for (a=sb->totpoint, bp= sb->bpoint; a>0; a--, bp++) { + for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) { copy_v3_v3(bp->prevvec, bp->vec); copy_v3_v3(bp->prevpos, bp->pos); } } - /* used by predictors and correctors */ static void softbody_store_state(Object *ob, float *ppos, float *pvel) { - SoftBody *sb= ob->soft; /* is supposed to be there*/ + SoftBody *sb = ob->soft; /* is supposed to be there*/ BodyPoint *bp; int a; - float *pp=ppos, *pv=pvel; + float *pp = ppos, *pv = pvel; - for (a=sb->totpoint, bp= sb->bpoint; a>0; a--, bp++) { + for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) { copy_v3_v3(pv, bp->vec); - pv+=3; + pv += 3; copy_v3_v3(pp, bp->pos); - pp+=3; + pp += 3; } } /* used by predictors and correctors */ static void softbody_retrieve_state(Object *ob, float *ppos, float *pvel) { - SoftBody *sb= ob->soft; /* is supposed to be there*/ + SoftBody *sb = ob->soft; /* is supposed to be there*/ BodyPoint *bp; int a; - float *pp=ppos, *pv=pvel; + float *pp = ppos, *pv = pvel; - for (a=sb->totpoint, bp= sb->bpoint; a>0; a--, bp++) { + for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) { copy_v3_v3(bp->vec, pv); - pv+=3; + pv += 3; copy_v3_v3(bp->pos, pp); - pp+=3; + pp += 3; } } /* used by predictors and correctors */ static void softbody_swap_state(Object *ob, float *ppos, float *pvel) { - SoftBody *sb= ob->soft; /* is supposed to be there*/ + SoftBody *sb = ob->soft; /* is supposed to be there*/ BodyPoint *bp; int a; - float *pp=ppos, *pv=pvel; + float *pp = ppos, *pv = pvel; float temp[3]; - for (a=sb->totpoint, bp= sb->bpoint; a>0; a--, bp++) { + for (a = sb->totpoint, bp = sb->bpoint; a > 0; a--, bp++) { copy_v3_v3(temp, bp->vec); copy_v3_v3(bp->vec, pv); copy_v3_v3(pv, temp); - pv+=3; + pv += 3; copy_v3_v3(temp, bp->pos); copy_v3_v3(bp->pos, pp); copy_v3_v3(pp, temp); - pp+=3; + pp += 3; } } #endif diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 7a95ec3055e..df48e505f6f 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -485,12 +485,24 @@ static void studiolight_calculate_radiance_cubemap_buffers(StudioLight *sl) NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); #if 0 - IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_X_POS], "/tmp/studiolight_radiance_left.png", IB_rectfloat); - IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_X_NEG], "/tmp/studiolight_radiance_right.png", IB_rectfloat); - IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Y_POS], "/tmp/studiolight_radiance_front.png", IB_rectfloat); - IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Y_NEG], "/tmp/studiolight_radiance_back.png", IB_rectfloat); - IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Z_POS], "/tmp/studiolight_radiance_bottom.png", IB_rectfloat); - IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Z_NEG], "/tmp/studiolight_radiance_top.png", IB_rectfloat); + IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_X_POS], + "/tmp/studiolight_radiance_left.png", + IB_rectfloat); + IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_X_NEG], + "/tmp/studiolight_radiance_right.png", + IB_rectfloat); + IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Y_POS], + "/tmp/studiolight_radiance_front.png", + IB_rectfloat); + IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Y_NEG], + "/tmp/studiolight_radiance_back.png", + IB_rectfloat); + IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Z_POS], + "/tmp/studiolight_radiance_bottom.png", + IB_rectfloat); + IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Z_NEG], + "/tmp/studiolight_radiance_top.png", + IB_rectfloat); #endif MEM_freeN(colbuf); } diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index ef4b9d95324..930f9ac5ee8 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -1563,7 +1563,8 @@ static void dump_buffer(TextUndoBuf *utxt) { int i = 0; - while (i++ < utxt->undo_pos) printf("%d: %d %c\n", i, utxt->buf[i], utxt->buf[i]); + while (i++ < utxt->undo_pos) + printf("%d: %d %c\n", i, utxt->buf[i], utxt->buf[i]); } /* Note: this function is outdated and must be updated if needed for future use */ @@ -1646,27 +1647,38 @@ void txt_print_undo(Text *text) i++; printf(" - Char is "); switch (op) { - case UNDO_INSERT_1: case UNDO_BS_1: case UNDO_DEL_1: + case UNDO_INSERT_1: + case UNDO_BS_1: + case UNDO_DEL_1: printf("%c", utxt->buf[i]); i++; break; - case UNDO_INSERT_2: case UNDO_BS_2: case UNDO_DEL_2: + case UNDO_INSERT_2: + case UNDO_BS_2: + case UNDO_DEL_2: printf("%c%c", utxt->buf[i], utxt->buf[i + 1]); i += 2; break; - case UNDO_INSERT_3: case UNDO_BS_3: case UNDO_DEL_3: + case UNDO_INSERT_3: + case UNDO_BS_3: + case UNDO_DEL_3: printf("%c%c%c", utxt->buf[i], utxt->buf[i + 1], utxt->buf[i + 2]); i += 3; break; - case UNDO_INSERT_4: case UNDO_BS_4: case UNDO_DEL_4: - { + case UNDO_INSERT_4: + case UNDO_BS_4: + case UNDO_DEL_4: { unsigned int uc; char c[BLI_UTF8_MAX + 1]; size_t c_len; - uc = utxt->buf[i]; i++; - uc = uc + (utxt->buf[i] << 8); i++; - uc = uc + (utxt->buf[i] << 16); i++; - uc = uc + (utxt->buf[i] << 24); i++; + uc = utxt->buf[i]; + i++; + uc = uc + (utxt->buf[i] << 8); + i++; + uc = uc + (utxt->buf[i] << 16); + i++; + uc = uc + (utxt->buf[i] << 24); + i++; c_len = BLI_str_utf8_from_unicode(uc, c); c[c_len] = '\0'; puts(c); @@ -1677,49 +1689,70 @@ void txt_print_undo(Text *text) else if (op == UNDO_DBLOCK || op == UNDO_IBLOCK) { i++; - linep = utxt->buf[i]; i++; - linep = linep + (utxt->buf[i] << 8); i++; - linep = linep + (utxt->buf[i] << 16); i++; - linep = linep + (utxt->buf[i] << 24); i++; + linep = utxt->buf[i]; + i++; + linep = linep + (utxt->buf[i] << 8); + i++; + linep = linep + (utxt->buf[i] << 16); + i++; + linep = linep + (utxt->buf[i] << 24); + i++; printf(" (length %d) <", linep); while (linep > 0) { putchar(utxt->buf[i]); - linep--; i++; + linep--; + i++; } - linep = utxt->buf[i]; i++; - linep = linep + (utxt->buf[i] << 8); i++; - linep = linep + (utxt->buf[i] << 16); i++; - linep = linep + (utxt->buf[i] << 24); i++; + linep = utxt->buf[i]; + i++; + linep = linep + (utxt->buf[i] << 8); + i++; + linep = linep + (utxt->buf[i] << 16); + i++; + linep = linep + (utxt->buf[i] << 24); + i++; printf("> (%d)", linep); } else if (op == UNDO_INDENT || op == UNDO_UNINDENT) { i++; - charp = utxt->buf[i]; i++; - charp = charp + (utxt->buf[i] << 8); i++; + charp = utxt->buf[i]; + i++; + charp = charp + (utxt->buf[i] << 8); + i++; - linep = utxt->buf[i]; i++; - linep = linep + (utxt->buf[i] << 8); i++; - linep = linep + (utxt->buf[i] << 16); i++; - linep = linep + (utxt->buf[i] << 24); i++; + linep = utxt->buf[i]; + i++; + linep = linep + (utxt->buf[i] << 8); + i++; + linep = linep + (utxt->buf[i] << 16); + i++; + linep = linep + (utxt->buf[i] << 24); + i++; printf("to <%d, %d> ", linep, charp); - charp = utxt->buf[i]; i++; - charp = charp + (utxt->buf[i] << 8); i++; + charp = utxt->buf[i]; + i++; + charp = charp + (utxt->buf[i] << 8); + i++; - linep = utxt->buf[i]; i++; - linep = linep + (utxt->buf[i] << 8); i++; - linep = linep + (utxt->buf[i] << 16); i++; - linep = linep + (utxt->buf[i] << 24); i++; + linep = utxt->buf[i]; + i++; + linep = linep + (utxt->buf[i] << 8); + i++; + linep = linep + (utxt->buf[i] << 16); + i++; + linep = linep + (utxt->buf[i] << 24); + i++; printf("from <%d, %d>", linep, charp); } - printf(" %d\n", i); + printf(" %d\n", i); i++; } } |