diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-28 14:24:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-28 14:27:52 +0400 |
| commit | e39a4961b5c352ee17fb06c0764831973ddbf1db (patch) | |
| tree | 6ac91dd919d478f3807a65335ed564a3cb9ef0b5 /source/blender/editors/object/object_add.c | |
| parent | 85945a8b862dc7ff5a8938959242e08da5e1cadc (diff) | |
Fix T41602: Camera draw size ignores scene scale
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 34b4ca2c0f1..6eb16a8a2d6 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -34,6 +34,7 @@ #include "MEM_guardedalloc.h" #include "DNA_anim_types.h" +#include "DNA_camera_types.h" #include "DNA_curve_types.h" #include "DNA_group_types.h" #include "DNA_lamp_types.h" @@ -552,6 +553,7 @@ static int object_camera_add_exec(bContext *C, wmOperator *op) View3D *v3d = CTX_wm_view3d(C); Scene *scene = CTX_data_scene(C); Object *ob; + Camera *cam; bool enter_editmode; unsigned int layer; float loc[3], rot[3]; @@ -572,6 +574,9 @@ static int object_camera_add_exec(bContext *C, wmOperator *op) } } + cam = ob->data; + cam->drawsize = v3d ? ED_view3d_grid_scale(scene, v3d, NULL) : ED_scene_grid_scale(scene, NULL); + return OPERATOR_FINISHED; } |