blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2017-12-08 00:21:54 +11:00
parent 1c7cfa025c efdd8f12a0
commit 1c0905be0f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/platform/platform_win32.cmake
View File

@ -143,7 +143,7 @@ if(NOT DEFINED LIBDIR)
set(LIBDIR_BASE "windows")
endif()
# Can be 1910..1912
if(MSVC_VERSION GREATER_EQUAL 1910)
if(MSVC_VERSION GREATER 1909)
message(STATUS "Visual Studio 2017 detected.")
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
elseif(MSVC_VERSION EQUAL 1900)

4
source/blender/imbuf/intern/cineon/cineon_dpx.c
View File

@ -59,7 +59,7 @@ static struct ImBuf *imb_load_dpx_cineon(
colorspace_set_default_role(colorspace, IM_MAX_SPACE, COLOR_ROLE_DEFAULT_FLOAT);
logImageSetVerbose((G.f & G_DEBUG) ? 1 : 0);
logImageSetVerbose((G.debug & G_DEBUG) ? 1 : 0);
image = logImageOpenFromMemory(mem, size);
@ -107,7 +107,7 @@ static int imb_save_dpx_cineon(ImBuf *ibuf, const char *filename, int use_cineon
return 0;
}
logImageSetVerbose((G.f & G_DEBUG) ? 1 : 0);
logImageSetVerbose((G.debug & G_DEBUG) ? 1 : 0);
depth = (ibuf->planes + 7) >> 3;
if (depth > 4 || depth < 3) {

4
source/blender/imbuf/intern/cineon/logImageCore.c
View File

@ -1020,6 +1020,7 @@ static int convertRGBA_RGB(float *src, float *dst, LogImageFile *logImage,
float *dst_ptr = dst;
switch (logElement.transfer) {
case transfer_Unspecified:
case transfer_UserDefined:
case transfer_Linear:
case transfer_Logarithmic: {
@ -1054,6 +1055,7 @@ static int convertRGBA_RGB(float *src, float *dst, LogImageFile *logImage,
}
default:
if (verbose) printf("DPX/Cineon: Unknown transfer %d.\n", logElement.transfer);
return 1;
}
}
@ -1066,6 +1068,7 @@ static int convertRGB_RGBA(float *src, float *dst, LogImageFile *logImage,
float *dst_ptr = dst;
switch (logElement.transfer) {
case transfer_Unspecified:
case transfer_UserDefined:
case transfer_Linear:
case transfer_Logarithmic: {
@ -1100,6 +1103,7 @@ static int convertRGB_RGBA(float *src, float *dst, LogImageFile *logImage,
}
default:
if (verbose) printf("DPX/Cineon: Unknown transfer %d.\n", logElement.transfer);
return 1;
}
}