diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
| commit | cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9 (patch) | |
| tree | 503d6bc4376b27a6efe73739609e9bbb1f1188cb /source/blender/editors/include | |
| parent | 0896a227232f741b6028219a208ae60e78515406 (diff) | |
| parent | b5595298d36a5023cc33ed41463fd6c032f2ec7b (diff) | |
Merged changes in the trunk up to revision 43038.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/BIF_glutil.h | 5 | ||||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index cd3d87a8979..33e9192a23e 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -136,13 +136,8 @@ void glaDrawPixelsSafe (float x, float y, int img_w, int img_h, int row_w, int * is expected to be in RGBA byte or float format, and the * modelview and projection matrices are assumed to define a * 1-to-1 mapping to screen space. - * @param gamma_correct Optionally gamma correct float sources to sRGB for display */ - /* only for float rects, converts to 32 bits and draws */ -void glaDrawPixelsSafe_to32(float fx, float fy, int img_w, int img_h, int row_w, float *rectf, int gamma_correct); - - void glaDrawPixelsTex (float x, float y, int img_w, int img_h, int format, void *rect); void glaDrawPixelsTexScaled(float x, float y, int img_w, int img_h, int format, void *rect, float scaleX, float scaleY); diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 4ac5a6eed4a..8373ea7c52e 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -589,8 +589,8 @@ DEF_ICON(MOD_SOLIDIFY) DEF_ICON(MOD_SCREW) DEF_ICON(MOD_VERTEX_WEIGHT) DEF_ICON(MOD_DYNAMICPAINT) +DEF_ICON(MOD_REMESH) #ifndef DEF_ICON_BLANK_SKIP - DEF_ICON(BLANK162) DEF_ICON(BLANK163) DEF_ICON(BLANK164) DEF_ICON(BLANK165) |