diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-16 17:36:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-16 17:43:19 +0300 |
| commit | 43d0943141cb745d69d36eb1cf177c22663def61 (patch) | |
| tree | 9e1caaf5b466e8c7c5f3f4ba52bbb74d541cf068 /source/blender/editors/mesh/editmesh_add.c | |
| parent | 2816694b0502652ec484b50b4f4773a8a4ce6ff8 (diff) | |
| parent | 5de9c8f6f0f5157251b8f9f103455ba7f3bf826a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index a21fc2fffde..292b28c772c 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -65,9 +65,10 @@ typedef struct MakePrimitiveData { bool was_editmode; } MakePrimitiveData; -static Object *make_prim_init(bContext *C, const char *idname, - const float loc[3], const float rot[3], const unsigned int layer, - MakePrimitiveData *r_creation_data) +static Object *make_prim_init( + bContext *C, const char *idname, + const float loc[3], const float rot[3], const unsigned int layer, + MakePrimitiveData *r_creation_data) { Object *obedit = CTX_data_edit_object(C); |