svn merge ^/trunk/blender -r46330:46335
[blender.git] / source / blender / editors / space_view3d / drawobject.c
index b1f86fa5e697a18658bad6e330f7405018aba61f..5186844f4025ad86539f304cd0c816804e5755c7 100644 (file)
@@ -2902,10 +2902,9 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
 
 #define DRAW_EM_MEASURE_STATS_FACEAREA()                                      \
        if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {                               \
-               mul_v3_fl(vmid, 1.0f / (float)n);                                     \
+               mul_v3_fl(vmid, 1.0 / n);                                             \
                if (unit->system)                                                     \
-                       bUnit_AsString(numstr, sizeof(numstr),                            \
-                                  (double)(area * unit->scale_length),               \
+                       bUnit_AsString(numstr, sizeof(numstr), area * unit->scale_length, \
                                       3, unit->system, B_UNIT_LENGTH, do_split, FALSE);  \
                else                                                                  \
                        BLI_snprintf(numstr, sizeof(numstr), conv_float, area);           \
@@ -6991,7 +6990,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag)
                                drawtexspace(ob);
                        }
                        if (dtx & OB_DRAWNAME) {
-                               /* patch for several 3d cards (IBM mostly) that crash on GL_SELECT with text drawing */
+                               /* patch for several 3d cards (IBM mostly) that crash on glSelect with text drawing */
                                /* but, we also don't draw names for sets or duplicators */
                                if (flag == 0) {
                                        float zero[3] = {0, 0, 0};