From c1a477b497c8d57ff9b402fdd285ea0f8d91d221 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 3 Aug 2021 15:27:20 +1000 Subject: Cleanup: use C++ comments or 'if 0' for commented code --- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/mask_rasterize.c | 4 ++-- source/blender/blenkernel/intern/mesh_normals.cc | 13 +++++----- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/particle_system.c | 2 +- source/blender/blenkernel/intern/screen.c | 2 +- source/blender/blenkernel/intern/softbody.c | 4 ++-- source/blender/blenlib/intern/boxpack_2d.c | 4 ++-- source/blender/blenlib/intern/path_util.c | 2 +- source/blender/blenlib/intern/scanfill.c | 22 ++++++++--------- source/blender/bmesh/intern/bmesh_mesh_normals.c | 6 ++--- source/blender/bmesh/tools/bmesh_bevel.c | 4 ++-- source/blender/editors/gpencil/annotate_paint.c | 28 +++++++++++----------- source/blender/editors/interface/interface_ops.c | 2 +- .../editors/sculpt_paint/paint_image_proj.c | 6 ++--- source/blender/gpu/intern/gpu_immediate.cc | 12 +++++----- source/blender/io/collada/SceneExporter.cpp | 2 +- source/blender/makesrna/intern/rna_access.c | 4 ++-- .../blender/python/intern/bpy_app_translations.c | 2 +- source/blender/windowmanager/intern/wm_window.c | 2 +- 20 files changed, 62 insertions(+), 63 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index b8ed519e8d1..434d696f9bd 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2663,7 +2663,7 @@ void BKE_pose_rebuild(Main *bmain, Object *ob, bArmature *arm, const bool do_id_ } } - /* printf("rebuild pose %s, %d bones\n", ob->id.name, counter); */ + // printf("rebuild pose %s, %d bones\n", ob->id.name, counter); /* synchronize protected layers with proxy */ /* HACK! To preserve 2.7x behavior that you always can pose even locked bones, diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index 81c161a4a7d..00ed7d86975 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -106,7 +106,7 @@ /* for debugging add... */ #ifndef NDEBUG -/* printf("%u %u %u %u\n", _t[0], _t[1], _t[2], _t[3]); \ */ +// printf("%u %u %u %u\n", _t[0], _t[1], _t[2], _t[3]); # define FACE_ASSERT(face, vert_max) \ { \ unsigned int *_t = face; \ @@ -1213,7 +1213,7 @@ void BKE_maskrasterize_handle_init(MaskRasterHandle *mr_handle, layer->falloff = masklay->falloff; } - /* printf("tris %d, feather tris %d\n", sf_tri_tot, tot_feather_quads); */ + // printf("tris %d, feather tris %d\n", sf_tri_tot, tot_feather_quads); } /* add trianges */ diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 1438d737b79..87b11904f90 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -1195,7 +1195,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli } } - // printf("FAN: vert %d, start edge %d\n", mv_pivot_index, ml_curr->e); + // printf("FAN: vert %d, start edge %d\n", mv_pivot_index, ml_curr->e); while (true) { const MEdge *me_curr = &medges[mlfan_curr->e]; @@ -1212,7 +1212,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli normalize_v3(vec_curr); } - // printf("\thandling edge %d / loop %d\n", mlfan_curr->e, mlfan_curr_index); + // printf("\thandling edge %d / loop %d\n", mlfan_curr->e, mlfan_curr_index); { /* Code similar to accumulate_vertex_normals_poly_v3. */ @@ -1252,9 +1252,8 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli if (IS_EDGE_SHARP(e2lfan_curr) || (me_curr == me_org)) { /* Current edge is sharp and we have finished with this fan of faces around this vert, - * or this vert is smooth, and we have completed a full turn around it. - */ - // printf("FAN: Finished!\n"); + * or this vert is smooth, and we have completed a full turn around it. */ + // printf("FAN: Finished!\n"); break; } @@ -1537,12 +1536,12 @@ static void loop_split_generator(TaskPool *pool, LoopSplitTaskDataCommon *common ml_curr_index, ml_prev_index, mp_index))) { - // printf("SKIPPING!\n"); + // printf("SKIPPING!\n"); } else { LoopSplitTaskData *data, data_local; - // printf("PROCESSING!\n"); + // printf("PROCESSING!\n"); if (pool) { if (data_idx == 0) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 89de37d6e4b..a6796d0513c 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -922,7 +922,7 @@ static void object_blend_read_lib(BlendLibReader *reader, ID *id) const short *totcol_data = BKE_object_material_len_p(ob); /* Only expand so as not to lose any object materials that might be set. */ if (totcol_data && (*totcol_data > ob->totcol)) { - /* printf("'%s' %d -> %d\n", ob->id.name, ob->totcol, *totcol_data); */ + // printf("'%s' %d -> %d\n", ob->id.name, ob->totcol, *totcol_data); BKE_object_material_resize(BLO_read_lib_get_main(reader), ob, *totcol_data, false); } } diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 06d3daaf4d6..9c0c5639777 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3112,7 +3112,7 @@ static void collision_fail(ParticleData *pa, ParticleCollision *col) copy_v3_v3(pa->state.vel, col->pce.vel); mul_v3_fl(pa->state.vel, col->inv_timestep); - /* printf("max iterations\n"); */ + // printf("max iterations\n"); } /* Particle - Mesh collision detection and response diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index c3885b5dcf7..e44c5a6b40e 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -766,7 +766,7 @@ void BKE_screen_remove_double_scrverts(bScreen *screen) while (v1) { if (v1->newv == NULL) { /* !?! */ if (v1->vec.x == verg->vec.x && v1->vec.y == verg->vec.y) { - /* printf("doublevert\n"); */ + // printf("doublevert\n"); v1->newv = verg; } } diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index e4e2ed94b41..1a408aceeb2 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2225,7 +2225,7 @@ static void sb_cf_threads_run(Scene *scene, totthread--; } - /* printf("sb_cf_threads_run spawning %d threads\n", totthread); */ + // printf("sb_cf_threads_run spawning %d threads\n", totthread); sb_threads = MEM_callocN(sizeof(SB_thread_context) * totthread, "SBThread"); memset(sb_threads, 0, sizeof(SB_thread_context) * totthread); @@ -2812,7 +2812,7 @@ static void reference_to_scratch(Object *ob) } mul_v3_fl(accu_pos, 1.0f / accu_mass); copy_v3_v3(sb->scratch->Ref.com, accu_pos); - /* printf("reference_to_scratch\n"); */ + // printf("reference_to_scratch\n"); } /* diff --git a/source/blender/blenlib/intern/boxpack_2d.c b/source/blender/blenlib/intern/boxpack_2d.c index ea6c2d8d498..4a07f1134d0 100644 --- a/source/blender/blenlib/intern/boxpack_2d.c +++ b/source/blender/blenlib/intern/boxpack_2d.c @@ -409,8 +409,8 @@ void BLI_box_pack_2d(BoxPack *boxarray, const uint len, float *r_tot_x, float *r for (i = 0; i < verts_pack_len && isect; i++) { vert = &vs_ctx.vertarray[vertex_pack_indices[i]]; - /* printf("\ttesting vert %i %i %i %f %f\n", i, - * vert->free, verts_pack_len, vert->x, vert->y); */ + // printf("\ttesting vert %i %i %i %f %f\n", i, + // vert->free, verts_pack_len, vert->x, vert->y); /* This vert has a free quadrant * Test if we can place the box here diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 4d0dc43ed1e..99fae1f1616 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1897,7 +1897,7 @@ bool BLI_path_name_at_index(const char *__restrict path, if (index_step == index) { *r_offset = prev; *r_len = i - prev; - /* printf("!!! %d %d\n", start, end); */ + // printf("!!! %d %d\n", start, end); return true; } index_step += 1; diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index b0d00007580..f0cf19bf508 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -430,7 +430,7 @@ static void testvertexnearedge(ScanFillContext *sf_ctx) /* new edge */ ed1 = BLI_scanfill_edge_add(sf_ctx, eed->v1, eve); - /* printf("fill: vertex near edge %x\n", eve); */ + // printf("fill: vertex near edge %x\n", eve); ed1->poly_nr = eed->poly_nr; eed->v1 = eve; eve->edge_tot = 3; @@ -608,7 +608,7 @@ static unsigned int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int fl sc = scdata; for (a = 0; a < verts; a++) { - /* printf("VERTEX %d index %d\n", a, sc->vert->tmp.u); */ + // printf("VERTEX %d index %d\n", a, sc->vert->tmp.u); /* Set connect-flags. */ for (ed1 = sc->edge_first; ed1; ed1 = eed_next) { eed_next = ed1->next; @@ -634,13 +634,13 @@ static unsigned int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int fl * (and doesn't work during grab). */ /* if (callLocalInterruptCallBack()) break; */ if (totface >= maxface) { - /* printf("Fill error: endless loop. Escaped at vert %d, tot: %d.\n", a, verts); */ + // printf("Fill error: endless loop. Escaped at vert %d, tot: %d.\n", a, verts); a = verts; break; } if (ed2 == NULL) { sc->edge_first = sc->edge_last = NULL; - /* printf("just 1 edge to vert\n"); */ + // printf("just 1 edge to vert\n"); BLI_addtail(&sf_ctx->filledgebase, ed1); ed1->v2->f = SF_VERT_NEW; ed1->v1->edge_tot--; @@ -662,7 +662,7 @@ static unsigned int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int fl break; } - /* printf("test verts %d %d %d\n", v1->tmp.u, v2->tmp.u, v3->tmp.u); */ + // printf("test verts %d %d %d\n", v1->tmp.u, v2->tmp.u, v3->tmp.u); miny = min_ff(v1->xy[1], v3->xy[1]); sc1 = sc + 1; @@ -705,7 +705,7 @@ static unsigned int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int fl if (best_sc) { /* make new edge, and start over */ - /* printf("add new edge %d %d and start again\n", v2->tmp.u, best_sc->vert->tmp.u); */ + // printf("add new edge %d %d and start again\n", v2->tmp.u, best_sc->vert->tmp.u); ed3 = BLI_scanfill_edge_add(sf_ctx, v2, best_sc->vert); BLI_remlink(&sf_ctx->filledgebase, ed3); @@ -717,7 +717,7 @@ static unsigned int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int fl } else { /* new triangle */ - /* printf("add face %d %d %d\n", v1->tmp.u, v2->tmp.u, v3->tmp.u); */ + // printf("add face %d %d %d\n", v1->tmp.u, v2->tmp.u, v3->tmp.u); addfillface(sf_ctx, v1, v2, v3); totface++; BLI_remlink((ListBase *)&(sc->edge_first), ed1); @@ -741,11 +741,11 @@ static unsigned int scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int fl ed3->v1->edge_tot++; ed3->v2->edge_tot++; - /* printf("add new edge %x %x\n", v1, v3); */ + // printf("add new edge %x %x\n", v1, v3); sc1 = addedgetoscanlist(scdata, ed3, verts); if (sc1) { /* ed3 already exists: remove if a boundary */ - /* printf("Edge exists\n"); */ + // printf("Edge exists\n"); ed3->v1->edge_tot--; ed3->v2->edge_tot--; @@ -954,7 +954,7 @@ unsigned int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const poly++; } } - /* printf("amount of poly's: %d\n", poly); */ + // printf("amount of poly's: %d\n", poly); } else if (poly) { /* we pre-calculated poly_nr */ @@ -1020,7 +1020,7 @@ unsigned int BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const } } if (BLI_listbase_is_empty(&sf_ctx->filledgebase)) { - /* printf("All edges removed\n"); */ + // printf("All edges removed\n"); return 0; } } diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.c b/source/blender/bmesh/intern/bmesh_mesh_normals.c index e62deb2dde5..746f094aed6 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_normals.c +++ b/source/blender/bmesh/intern/bmesh_mesh_normals.c @@ -756,7 +756,7 @@ static int bm_mesh_loops_calc_normals_for_loop(BMesh *bm, /* Fix/update all clnors of this fan with computed average value. */ /* Prints continuously when merge custom normals, so commenting. */ - /* printf("Invalid clnors in this fan!\n"); */ + // printf("Invalid clnors in this fan!\n"); while ((clnor = BLI_SMALLSTACK_POP(clnors))) { // print_v2("org clnor", clnor); @@ -1834,8 +1834,8 @@ void BM_lnorspace_invalidate(BMesh *bm, const bool do_invalidate_all) BM_mesh_elem_index_ensure(bm, BM_VERT); /* When we affect a given vertex, we may affect following smooth fans: - * - all smooth fans of said vertex; - * - all smooth fans of all immediate loop-neighbors vertices; + * - all smooth fans of said vertex; + * - all smooth fans of all immediate loop-neighbors vertices; * This can be simplified as 'all loops of selected vertices and their immediate neighbors' * need to be tagged for update. */ diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 0f99f04ad57..e306fe47770 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2511,7 +2511,7 @@ static void bevel_harden_normals(BevelParams *bp, BMesh *bm) pnorm = lnext->f->no; } else { - /* printf("unexpected harden case (edge)\n"); */ + // printf("unexpected harden case (edge)\n"); } } else if (fkind == F_VERT) { @@ -2554,7 +2554,7 @@ static void bevel_harden_normals(BevelParams *bp, BMesh *bm) pnorm = norm; } else { - /* printf("unexpected harden case (vert)\n"); */ + // printf("unexpected harden case (vert)\n"); } } } diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 9bf44370c80..31ef094afa6 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -1507,7 +1507,7 @@ static void annotation_session_cleanup(tGPsdata *p) /* free stroke buffer */ if (gpd->runtime.sbuffer) { - /* printf("\t\tGP - free sbuffer\n"); */ + // printf("\t\tGP - free sbuffer\n"); MEM_freeN(gpd->runtime.sbuffer); gpd->runtime.sbuffer = NULL; } @@ -2221,20 +2221,20 @@ static int annotation_draw_exec(bContext *C, wmOperator *op) tGPsdata *p = NULL; Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); - /* printf("GPencil - Starting Re-Drawing\n"); */ + // printf("GPencil - Starting Re-Drawing\n"); /* try to initialize context data needed while drawing */ if (!annotation_draw_init(C, op, NULL)) { if (op->customdata) { MEM_freeN(op->customdata); } - /* printf("\tGP - no valid data\n"); */ + // printf("\tGP - no valid data\n"); return OPERATOR_CANCELLED; } p = op->customdata; - /* printf("\tGP - Start redrawing stroke\n"); */ + // printf("\tGP - Start redrawing stroke\n"); /* loop over the stroke RNA elements recorded (i.e. progress of mouse movement), * setting the relevant values in context at each step, then applying @@ -2242,7 +2242,7 @@ static int annotation_draw_exec(bContext *C, wmOperator *op) RNA_BEGIN (op->ptr, itemptr, "stroke") { float mousef[2]; - /* printf("\t\tGP - stroke elem\n"); */ + // printf("\t\tGP - stroke elem\n"); /* get relevant data for this point from stroke */ RNA_float_get_array(&itemptr, "mouse", mousef); @@ -2277,7 +2277,7 @@ static int annotation_draw_exec(bContext *C, wmOperator *op) } RNA_END; - /* printf("\tGP - done\n"); */ + // printf("\tGP - done\n"); /* cleanup */ annotation_draw_exit(C, op); @@ -2361,7 +2361,7 @@ static int annotation_draw_invoke(bContext *C, wmOperator *op, const wmEvent *ev /* only start drawing immediately if we're allowed to do so... */ if (RNA_boolean_get(op->ptr, "wait_for_input") == false) { /* hotkey invoked - start drawing */ - /* printf("\tGP - set first spot\n"); */ + // printf("\tGP - set first spot\n"); p->status = GP_STATUS_PAINTING; /* handle the initial drawing - i.e. for just doing a simple dot */ @@ -2370,7 +2370,7 @@ static int annotation_draw_invoke(bContext *C, wmOperator *op, const wmEvent *ev } else { /* toolbar invoked - don't start drawing yet... */ - /* printf("\tGP - hotkey invoked... waiting for click-drag\n"); */ + // printf("\tGP - hotkey invoked... waiting for click-drag\n"); op->flag |= OP_IS_MODAL_CURSOR_REGION; } @@ -2399,7 +2399,7 @@ static tGPsdata *annotation_stroke_begin(bContext *C, wmOperator *op) p->status = GP_STATUS_ERROR; } - /* printf("\t\tGP - start stroke\n"); */ + // printf("\t\tGP - start stroke\n"); /* we may need to set up paint env again if we're resuming */ /* XXX: watch it with the paintmode! in future, @@ -2547,7 +2547,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve if (event->val == KM_PRESS && ELEM(event->type, EVT_RETKEY, EVT_PADENTER, EVT_ESCKEY, EVT_SPACEKEY, EVT_EKEY)) { /* exit() ends the current stroke before cleaning up */ - /* printf("\t\tGP - end of paint op + end of stroke\n"); */ + // printf("\t\tGP - end of paint op + end of stroke\n"); p->status = GP_STATUS_DONE; estate = OPERATOR_FINISHED; } @@ -2571,7 +2571,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve if (sketch) { /* end stroke only, and then wait to resume painting soon */ - /* printf("\t\tGP - end stroke only\n"); */ + // printf("\t\tGP - end stroke only\n"); annotation_stroke_end(op); /* If eraser mode is on, turn it off after the stroke finishes @@ -2602,7 +2602,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve WM_event_add_notifier(C, NC_GPENCIL | NA_EDITED, NULL); } else { - /* printf("\t\tGP - end of stroke + op\n"); */ + // printf("\t\tGP - end of stroke + op\n"); p->status = GP_STATUS_DONE; estate = OPERATOR_FINISHED; } @@ -2719,7 +2719,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve } else { /* event handled, so just tag as running modal */ - /* printf("\t\t\t\tGP - add point handled!\n"); */ + // printf("\t\t\t\tGP - add point handled!\n"); estate = OPERATOR_RUNNING_MODAL; } } @@ -2729,7 +2729,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve /* just resize the brush (local version) * TODO: fix the hardcoded size jumps (set to make a visible difference) and hardcoded keys */ - /* printf("\t\tGP - resize eraser\n"); */ + // printf("\t\tGP - resize eraser\n"); switch (event->type) { case WHEELDOWNMOUSE: /* larger */ case EVT_PADPLUSKEY: diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 20af3054882..a75cc839ae4 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1557,7 +1557,7 @@ static int edittranslation_exec(bContext *C, wmOperator *op) } /* Try to find a valid po file for current language... */ edittranslation_find_po_file(root, uilng, popath, FILE_MAX); - /* printf("po path: %s\n", popath); */ + // printf("po path: %s\n", popath); if (popath[0] == '\0') { BKE_reportf( op->reports, RPT_ERROR, "No valid po found for language '%s' under %s", uilng, root); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index a8ad6ab1b74..a58b1947b0c 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -4512,7 +4512,7 @@ static void project_paint_begin(const bContext *C, ps->buckets_x = (int)(ps->screen_width / (((float)diameter) / PROJ_BUCKET_BRUSH_DIV)); ps->buckets_y = (int)(ps->screen_height / (((float)diameter) / PROJ_BUCKET_BRUSH_DIV)); - /* printf("\tscreenspace bucket division x:%d y:%d\n", ps->buckets_x, ps->buckets_y); */ + // printf("\tscreenspace bucket division x:%d y:%d\n", ps->buckets_x, ps->buckets_y); if (ps->buckets_x > PROJ_BUCKET_RECT_MAX || ps->buckets_y > PROJ_BUCKET_RECT_MAX) { reset_threads = true; @@ -5194,8 +5194,8 @@ static void do_projectpaint_thread(TaskPool *__restrict UNUSED(pool), void *ph_v softenArena = BLI_memarena_new(MEM_SIZE_OPTIMAL(1 << 16), "paint soften arena"); } - /* printf("brush bounds %d %d %d %d\n", - * bucketMin[0], bucketMin[1], bucketMax[0], bucketMax[1]); */ + // printf("brush bounds %d %d %d %d\n", + // bucketMin[0], bucketMin[1], bucketMax[0], bucketMax[1]); while (project_bucket_iter_next(ps, &bucket_index, &bucket_bounds, pos)) { diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index 062741a6270..cdd56a117db 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -313,7 +313,7 @@ void immAttr1f(uint attr_id, float x) setAttrValueBit(attr_id); float *data = (float *)(imm->vertex_data + attr->offset); - /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); */ + // printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); data[0] = x; } @@ -329,7 +329,7 @@ void immAttr2f(uint attr_id, float x, float y) setAttrValueBit(attr_id); float *data = (float *)(imm->vertex_data + attr->offset); - /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); */ + // printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); data[0] = x; data[1] = y; @@ -346,7 +346,7 @@ void immAttr3f(uint attr_id, float x, float y, float z) setAttrValueBit(attr_id); float *data = (float *)(imm->vertex_data + attr->offset); - /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); */ + // printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); data[0] = x; data[1] = y; @@ -364,7 +364,7 @@ void immAttr4f(uint attr_id, float x, float y, float z, float w) setAttrValueBit(attr_id); float *data = (float *)(imm->vertex_data + attr->offset); - /* printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); */ + // printf("%s %td %p\n", __FUNCTION__, (GLubyte*)data - imm->buffer_data, data); data[0] = x; data[1] = y; @@ -445,7 +445,7 @@ void immAttr3ub(uint attr_id, uchar r, uchar g, uchar b) setAttrValueBit(attr_id); uchar *data = imm->vertex_data + attr->offset; - /* printf("%s %td %p\n", __FUNCTION__, data - imm->buffer_data, data); */ + // printf("%s %td %p\n", __FUNCTION__, data - imm->buffer_data, data); data[0] = r; data[1] = g; @@ -463,7 +463,7 @@ void immAttr4ub(uint attr_id, uchar r, uchar g, uchar b, uchar a) setAttrValueBit(attr_id); uchar *data = imm->vertex_data + attr->offset; - /* printf("%s %td %p\n", __FUNCTION__, data - imm->buffer_data, data); */ + // printf("%s %td %p\n", __FUNCTION__, data - imm->buffer_data, data); data[0] = r; data[1] = g; diff --git a/source/blender/io/collada/SceneExporter.cpp b/source/blender/io/collada/SceneExporter.cpp index 5bbd22b8275..09da2288cfc 100644 --- a/source/blender/io/collada/SceneExporter.cpp +++ b/source/blender/io/collada/SceneExporter.cpp @@ -172,7 +172,7 @@ void SceneExporter::writeNode(Object *ob) else if (ob->type == OB_EMPTY) { /* TODO: handle groups (OB_DUPLICOLLECTION */ if ((ob->transflag & OB_DUPLICOLLECTION) == OB_DUPLICOLLECTION && ob->instance_collection) { Collection *collection = ob->instance_collection; - /* printf("group detected '%s'\n", group->id.name + 2); */ + // printf("group detected '%s'\n", group->id.name + 2); FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (collection, object) { printf("\t%s\n", object->id.name); } diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index feacd47c98c..46d60bf0da9 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -6723,7 +6723,7 @@ bool RNA_struct_property_is_set_ex(PointerRNA *ptr, const char *identifier, bool return RNA_property_is_set_ex(ptr, prop, use_ghost); } /* python raises an error */ - /* printf("%s: %s.%s not found.\n", __func__, ptr->type->identifier, name); */ + // printf("%s: %s.%s not found.\n", __func__, ptr->type->identifier, name); return 0; } @@ -6735,7 +6735,7 @@ bool RNA_struct_property_is_set(PointerRNA *ptr, const char *identifier) return RNA_property_is_set(ptr, prop); } /* python raises an error */ - /* printf("%s: %s.%s not found.\n", __func__, ptr->type->identifier, name); */ + // printf("%s: %s.%s not found.\n", __func__, ptr->type->identifier, name); return 0; } diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index 7437598582f..de70035eb2b 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -746,7 +746,7 @@ static PyObject *app_translations_new(PyTypeObject *type, PyObject *UNUSED(args), PyObject *UNUSED(kw)) { - /* printf("%s (%p)\n", __func__, _translations); */ + // printf("%s (%p)\n", __func__, _translations); if (!_translations) { _translations = (BlenderAppTranslations *)type->tp_alloc(type, 0); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 1b08b8dad92..8f37e7f34a9 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1416,7 +1416,7 @@ static int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_ptr wm_event_add(win, &event); - /* printf("Drop detected\n"); */ + // printf("Drop detected\n"); /* add drag data to wm for paths: */ -- cgit v1.2.3