Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 02:10:56 +0000 (13:10 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 02:10:56 +0000 (13:10 +1100)
source/blender/blenkernel/intern/camera.c
source/blender/makesrna/intern/rna_camera.c

index 54ce0d3a9036cb923f9d309b8c20e684236c3046..7457fc8b7ad0916ae97568973b1abf9ec08d2c17 100644 (file)
@@ -378,7 +378,7 @@ void BKE_camera_view_frame_ex(
                facy = 0.5f * camera->ortho_scale * r_asp[1] * scale[1];
                r_shift[0] = camera->shiftx * camera->ortho_scale * scale[0];
                r_shift[1] = camera->shifty * camera->ortho_scale * scale[1];
-               depth = do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : -drawsize * camera->ortho_scale * scale[2];
+               depth = do_clip ? -((camera->clipsta * scale[2]) + 0.1f) : -(drawsize * 2.0f) * scale[2];
 
                *r_drawsize = 0.5f * camera->ortho_scale;
        }
index 1e68ab659655bcb48c2ba4f1448893f7aa31631a..aee14cd3185d4cce3a5f769750f62aa92e7d5181 100644 (file)
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
 
+static float rna_Camera_draw_size_get(PointerRNA *ptr)
+{
+       Camera *cam = ptr->id.data;
+       return cam->drawsize * 2.0f;
+}
+
+static void rna_Camera_draw_size_set(PointerRNA *ptr, float value)
+{
+       Camera *cam = ptr->id.data;
+       cam->drawsize = value / 2.0f;
+}
+
 static float rna_Camera_angle_get(PointerRNA *ptr)
 {
        Camera *cam = ptr->id.data;
@@ -502,7 +514,11 @@ void RNA_def_camera(BlenderRNA *brna)
        RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Camera_update");
 
        prop = RNA_def_property(srna, "display_size", PROP_FLOAT, PROP_DISTANCE);
+#if 0
        RNA_def_property_float_sdna(prop, NULL, "drawsize");
+#else
+       RNA_def_property_float_funcs(prop, "rna_Camera_draw_size_get", "rna_Camera_draw_size_set", NULL);
+#endif
        RNA_def_property_float_default(prop, 1.0f);
        RNA_def_property_range(prop, 0.01f, 1000.0f);
        RNA_def_property_ui_range(prop, 0.01, 100, 1, 2);