diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 22 | ||||
| -rw-r--r-- | source/blender/collada/DocumentImporter.cpp | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/cineonlib.c | 1 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/cineon/dpxlib.c | 1 |
4 files changed, 19 insertions, 6 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index dfc164592b7..123e95c013c 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -552,6 +552,7 @@ from .properties_mask_common import ( MASK_PT_point, MASK_PT_display, MASK_PT_tools, + MASK_PT_add, ) @@ -580,6 +581,20 @@ class IMAGE_PT_active_mask_point(MASK_PT_point, Panel): bl_region_type = 'UI' +class IMAGE_PT_tools_mask(MASK_PT_tools, Panel): + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'TOOLS' + bl_category = 'Mask' + +class IMAGE_PT_tools_mask_add(MASK_PT_add, Panel): + bl_space_type = 'IMAGE_EDITOR' + bl_region_type = 'TOOLS' + bl_category = 'Mask' + + +# --- end mask --- + + class IMAGE_PT_image_properties(Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' @@ -1158,12 +1173,6 @@ class IMAGE_PT_uv_sculpt(Panel, ImagePaintPanel): col.prop(uvsculpt, "show_brush") -class IMAGE_PT_tools_mask(MASK_PT_tools, Panel): - bl_space_type = 'IMAGE_EDITOR' - bl_region_type = 'TOOLS' - bl_category = 'Mask' - -# --- end mask --- class IMAGE_PT_options_uvs(Panel, UVToolsPanel): @@ -1348,6 +1357,7 @@ classes = ( IMAGE_HT_header, MASK_MT_editor_menus, IMAGE_PT_mask, + IMAGE_PT_tools_mask_add, IMAGE_PT_mask_layers, IMAGE_PT_mask_display, IMAGE_PT_active_mask_spline, diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index ec9a4169b26..d3e23f740c8 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -62,6 +62,7 @@ extern "C" { #include "BKE_layer.h" #include "BKE_lamp.h" #include "BKE_library.h" +#include "BKE_texture.h" #include "BKE_fcurve.h" #include "BKE_scene.h" #include "BKE_global.h" diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index fbce508af17..50d0e843890 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -318,6 +318,7 @@ LogImageFile *cineonOpen(const unsigned char *byteStuff, int fromMemory, size_t printf("Gamma: %f\n", cineon->gamma); printf("Reference black: %f\n", cineon->referenceBlack); printf("Reference white: %f\n", cineon->referenceWhite); + printf("Orientation: %d\n", header.imageHeader.orientation); printf("----------------------------\n"); } return cineon; diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 429a19936a5..1e4f299def7 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -377,6 +377,7 @@ LogImageFile *dpxOpen(const unsigned char *byteStuff, int fromMemory, size_t buf printf("Gamma: %f\n", dpx->gamma); printf("Reference black: %f\n", dpx->referenceBlack); printf("Reference white: %f\n", dpx->referenceWhite); + printf("Orientation: %d\n", header.imageHeader.orientation); printf("----------------------------\n"); } return dpx; |