[Bf-blender-cvs] [e39a496] master: Fix T41602: Camera draw size ignores scene scale

[Campbell Barton]

Commit: e39a4961b5c352ee17fb06c0764831973ddbf1db
Author: Campbell Barton
Date:   Thu Aug 28 20:24:43 2014 +1000
Branches: master
https://developer.blender.org/rBe39a4961b5c352ee17fb06c0764831973ddbf1db

Fix T41602: Camera draw size ignores scene scale

===================================================================

M       source/blender/editors/object/object_add.c

===================================================================

diff --git a/source/blender/editors/object/object_add.c 
b/source/blender/editors/object/object_add.c
index 34b4ca2..6eb16a8 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;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs