diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-29 09:05:38 +0300 |
| commit | 9bd0c63382bf226c271c40d5a5967c22c75718ea (patch) | |
| tree | 97ad1061c10f39498459d54da34caddd59d39fbd /source/blender/editors/uvedit | |
| parent | be983295ea14af226b3c824a035ccee9d416c67f (diff) | |
| parent | af36dd4664ddf35c7ad99f05f9878ce1acf787bd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/uvedit')
4 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c index 5e867afd58e..b37703d03dd 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.c +++ b/source/blender/editors/uvedit/uvedit_buttons.c @@ -235,4 +235,3 @@ void ED_uvedit_buttons_register(ARegionType *art) pt->poll = image_panel_uv_poll; BLI_addtail(&art->paneltypes, pt); } - diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c index da50fe51d27..08df08dafb4 100644 --- a/source/blender/editors/uvedit/uvedit_draw.c +++ b/source/blender/editors/uvedit/uvedit_draw.c @@ -1074,4 +1074,3 @@ void ED_uvedit_draw_main( ED_image_draw_cursor(ar, sima->cursor); } } - diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 1d2583cf9d4..79e804725e5 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -4702,4 +4702,3 @@ void param_flush_restore(ParamHandle *handle) p_face_restore_uvs(f); } } - diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.h b/source/blender/editors/uvedit/uvedit_parametrizer.h index 50b4ee66644..2714bc33769 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.h +++ b/source/blender/editors/uvedit/uvedit_parametrizer.h @@ -120,4 +120,3 @@ void param_flush_restore(ParamHandle *handle); #endif #endif /*__UVEDIT_PARAMETRIZER_H__*/ - |