diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-18 00:56:25 +0400 |
| commit | 48006292d8b3c6c8dd4bfe87bdbe271db93cffff (patch) | |
| tree | ca98c07367717703c5a8801063cc42e0aff5b855 /source/blender/editors/space_image | |
| parent | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (diff) | |
| parent | 61596d5bb365a96b4b19adf0ef72ec1ea47212aa (diff) | |
svn merge ^/trunk/blender -r44189:44204
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_intern.h | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_intern.h b/source/blender/editors/space_image/image_intern.h index 29673f74538..71762a087a7 100644 --- a/source/blender/editors/space_image/image_intern.h +++ b/source/blender/editors/space_image/image_intern.h @@ -29,8 +29,8 @@ */ -#ifndef ED_IMAGE_INTERN_H -#define ED_IMAGE_INTERN_H +#ifndef __IMAGE_INTERN_H__ +#define __IMAGE_INTERN_H__ /* internal exports only */ struct bContext; @@ -95,5 +95,5 @@ void image_buttons_register(struct ARegionType *art); void IMAGE_OT_properties(struct wmOperatorType *ot); void IMAGE_OT_scopes(struct wmOperatorType *ot); -#endif /* ED_IMAGE_INTERN_H */ +#endif /* __IMAGE_INTERN_H__ */ diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index b03ae1aecd6..dd988c94dc9 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -870,6 +870,12 @@ static void image_buttons_area_listener(ARegion *ar, wmNotifier *wmn) if(wmn->action==NA_EDITED) ED_region_tag_redraw(ar); break; + case NC_TEXTURE: + case NC_MATERIAL: + /* sending by texture render job and needed to properly update displaying + * brush texture icon */ + ED_region_tag_redraw(ar); + break; } } |