diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 16:49:59 +0300 |
commit | 58adc586612e695d04033f2029362f279a9c05a4 (patch) | |
tree | 0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/space_image | |
parent | 0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff) | |
parent | a247b53084760498ca81eb6bdb901dee8f3a02ca (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image')
-rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index 92f625ef052..26162266441 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -965,7 +965,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char uiItemR(col, &imaptr, "use_view_as_render", 0, NULL, ICON_NONE); if (ima->source != IMA_SRC_GENERATED) { - if (compact == 0) { /* background image view doesnt need these */ + if (compact == 0) { /* background image view doesn't need these */ ImBuf *ibuf = BKE_image_acquire_ibuf(ima, iuser, NULL); bool has_alpha = true; @@ -1051,7 +1051,7 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr, bool color_ma PointerRNA display_settings_ptr; PropertyRNA *prop; const int depth_ok = BKE_imtype_valid_depths(imf->imtype); - /* some settings depend on this being a scene thats rendered */ + /* some settings depend on this being a scene that's rendered */ const bool is_render_out = (id && GS(id->name) == ID_SCE); uiLayout *col; |