← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_view3d/view3d_ruler.c

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_view3d/view3d_ruler.c
335
335
        bGPDstroke *gps;
336
336
        RulerItem *ruler_item;
337
337
        const char *ruler_name = RULER_ID;
338
 
        bool change = false;
 
338
        bool changed = false;
339
339
 
340
340
        if (scene->gpd == NULL) {
341
341
                scene->gpd = gpencil_data_addnew("GPencil");
377
377
                }
378
378
                gps->flag = GP_STROKE_3DSPACE;
379
379
                BLI_addtail(&gpf->strokes, gps);
380
 
                change = true;
 
380
                changed = true;
381
381
        }
382
382
 
383
 
        return change;
 
383
        return changed;
384
384
}
385
385
 
386
386
static bool view3d_ruler_from_gpencil(bContext *C, RulerInfo *ruler_info)
387
387
{
388
388
        Scene *scene = CTX_data_scene(C);
389
 
        bool change = false;
 
389
        bool changed = false;
390
390
 
391
391
        if (scene->gpd) {
392
392
                bGPDlayer *gpl;
407
407
                                                        pt++;
408
408
                                                }
409
409
                                                ruler_item->flag |= RULERITEM_USE_ANGLE;
410
 
                                                change = true;
 
410
                                                changed = true;
411
411
                                        }
412
412
                                        else if (gps->totpoints == 2) {
413
413
                                                RulerItem *ruler_item = ruler_item_add(ruler_info);
415
415
                                                        copy_v3_v3(ruler_item->co[j], &pt->x);
416
416
                                                        pt++;
417
417
                                                }
418
 
                                                change = true;
 
418
                                                changed = true;
419
419
                                        }
420
420
                                }
421
421
                        }
422
422
                }
423
423
        }
424
424
 
425
 
        return change;
 
425
        return changed;
426
426
}
427
427
 
428
428
/* -------------------------------------------------------------------- */
541
541
 
542
542
                                ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
543
543
 
544
 
                                BLF_width_and_height(blf_mono_font, numstr, &numstr_size[0], &numstr_size[1]);
 
544
                                BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
545
545
 
546
546
                                pos[0] = co_ss[1][0] + (cap_size * 2.0f);
547
547
                                pos[1] = co_ss[1][1] - (numstr_size[1] / 2.0f);
627
627
 
628
628
                                ruler_item_as_string(ruler_item, unit, numstr, sizeof(numstr), prec);
629
629
 
630
 
                                BLF_width_and_height(blf_mono_font, numstr, &numstr_size[0], &numstr_size[1]);
 
630
                                BLF_width_and_height(blf_mono_font, numstr, sizeof(numstr), &numstr_size[0], &numstr_size[1]);
631
631
 
632
632
                                mid_v2_v2v2(pos, co_ss[0], co_ss[2]);
633
633
 
809
809
        return OPERATOR_RUNNING_MODAL;
810
810
}
811
811
 
812
 
static int view3d_ruler_cancel(bContext *C, wmOperator *op)
 
812
static void view3d_ruler_cancel(bContext *C, wmOperator *op)
813
813
{
814
814
        RulerInfo *ruler_info = op->customdata;
815
815
 
816
816
        view3d_ruler_end(C, ruler_info);
817
817
        view3d_ruler_free(ruler_info);
818
818
        op->customdata = NULL;
819
 
 
820
 
        return OPERATOR_CANCELLED;
821
819
}
822
820
 
823
821
static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event)
859
857
 
860
858
                                        if (event->ctrl ||
861
859
                                            /* weak - but user friendly */
862
 
                                            (ruler_info->items.first == NULL))
 
860
                                            BLI_listbase_is_empty(&ruler_info->items))
863
861
                                        {
864
862
                                                View3D *v3d = CTX_wm_view3d(C);
865
863
                                                const bool use_depth = (v3d->drawtype >= OB_SOLID);