forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
7fdb9e168d
@ -1423,6 +1423,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
|
||||
"/wd4800" # forcing value to bool 'true' or 'false'
|
||||
# errors:
|
||||
"/we4013" # 'function' undefined; assuming extern returning int
|
||||
"/we4133" # incompatible pointer types
|
||||
"/we4431" # missing type specifier - int assumed
|
||||
)
|
||||
|
||||
|
@ -101,8 +101,8 @@ cd %Staging%\%BuildDir%%ARCH%R
|
||||
echo %DATE% %TIME% : Start > %StatusFile%
|
||||
cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DBUILD_MODE=Release -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/
|
||||
echo %DATE% %TIME% : Release Configuration done >> %StatusFile%
|
||||
msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log
|
||||
msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log
|
||||
msbuild /m "ll.vcxproj" /p:Configuration=Release /fl /flp:logfile=BlenderDeps_llvm.log;Verbosity=normal
|
||||
msbuild /m "BlenderDependencies.sln" /p:Configuration=Release /fl /flp:logfile=BlenderDeps.log;Verbosity=minimal /verbosity:minimal
|
||||
echo %DATE% %TIME% : Release Build done >> %StatusFile%
|
||||
cmake --build . --target Harvest_Release_Results > Harvest_Release.txt
|
||||
echo %DATE% %TIME% : Release Harvest done >> %StatusFile%
|
||||
@ -111,8 +111,8 @@ mkdir %STAGING%\%BuildDir%%ARCH%D
|
||||
cd %Staging%\%BuildDir%%ARCH%D
|
||||
cmake -G "%CMAKE_BUILDER%" %SOURCE_DIR% -DDOWNLOAD_DIR=%BUILD_DIR%/downloads -DCMAKE_BUILD_TYPE=Debug -DBUILD_MODE=Debug -DHARVEST_TARGET=%HARVEST_DIR%/%HARVESTROOT%%VSVER_SHORT%/ %CMAKE_DEBUG_OPTIONS%
|
||||
echo %DATE% %TIME% : Debug Configuration done >> %StatusFile%
|
||||
msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log
|
||||
msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps.log
|
||||
msbuild /m "ll.vcxproj" /p:Configuration=Debug /fl /flp:logfile=BlenderDeps_llvm.log;;Verbosity=normal
|
||||
msbuild /m "BlenderDependencies.sln" /p:Configuration=Debug /verbosity:n /fl /flp:logfile=BlenderDeps.log;;Verbosity=normal
|
||||
echo %DATE% %TIME% : Debug Build done >> %StatusFile%
|
||||
cmake --build . --target Harvest_Debug_Results> Harvest_Debug.txt
|
||||
echo %DATE% %TIME% : Debug Harvest done >> %StatusFile%
|
||||
|
@ -4044,7 +4044,7 @@ bool BKE_nurb_check_valid_u(struct Nurb *nu)
|
||||
return true; /* not a nurb, lets assume its valid */
|
||||
|
||||
if (nu->pntsu < nu->orderu) return false;
|
||||
if (((nu->flag & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) { /* Bezier U Endpoints */
|
||||
if (((nu->flagu & CU_NURB_CYCLIC) == 0) && (nu->flagu & CU_NURB_BEZIER)) { /* Bezier U Endpoints */
|
||||
if (nu->orderu == 4) {
|
||||
if (nu->pntsu < 5)
|
||||
return false; /* bezier with 4 orderu needs 5 points */
|
||||
@ -4065,7 +4065,7 @@ bool BKE_nurb_check_valid_v(struct Nurb *nu)
|
||||
|
||||
if (nu->pntsv < nu->orderv)
|
||||
return false;
|
||||
if (((nu->flag & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) { /* Bezier V Endpoints */
|
||||
if (((nu->flagv & CU_NURB_CYCLIC) == 0) && (nu->flagv & CU_NURB_BEZIER)) { /* Bezier V Endpoints */
|
||||
if (nu->orderv == 4) {
|
||||
if (nu->pntsv < 5)
|
||||
return false; /* bezier with 4 orderu needs 5 points */
|
||||
|
@ -1703,24 +1703,6 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
Brush *br;
|
||||
br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Average");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(main, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
|
||||
br = (Brush *)BKE_libblock_find_name_ex(main, ID_BR, "Smear");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(main, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_SMEAR;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -275,6 +275,20 @@ void BLO_update_defaults_startup_blend(Main *bmain)
|
||||
br->ob_mode = OB_MODE_TEXTURE_PAINT;
|
||||
}
|
||||
|
||||
/* Vertex/Weight Paint */
|
||||
br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Average");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(bmain, "Average", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_AVERAGE;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Smear");
|
||||
if (!br) {
|
||||
br = BKE_brush_add(bmain, "Smear", OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT);
|
||||
br->vertexpaint_tool = PAINT_BLEND_SMEAR;
|
||||
br->ob_mode = OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT;
|
||||
}
|
||||
|
||||
br = (Brush *)BKE_libblock_find_name_ex(bmain, ID_BR, "Mask");
|
||||
if (br) {
|
||||
br->imagepaint_tool = PAINT_TOOL_MASK;
|
||||
|
@ -476,20 +476,35 @@ int BGL_typeSize(int type)
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int gl_buffer_type_from_py_format_char(char format)
|
||||
static int gl_buffer_type_from_py_format_char(char *typestr)
|
||||
{
|
||||
if (ELEM(typestr[0], '<', '>', '|')) {
|
||||
typestr += 1;
|
||||
}
|
||||
char format = typestr[0];
|
||||
char byte_num = typestr[1];
|
||||
|
||||
switch (format) {
|
||||
case 't':
|
||||
case 'b':
|
||||
return GL_BYTE;
|
||||
case 'h':
|
||||
if (!byte_num) return GL_BYTE;
|
||||
ATTR_FALLTHROUGH;
|
||||
case 'i':
|
||||
return GL_SHORT;
|
||||
if (!byte_num) return GL_SHORT;
|
||||
ATTR_FALLTHROUGH;
|
||||
case 'l':
|
||||
return GL_INT;
|
||||
if (!byte_num || byte_num == '4') return GL_INT;
|
||||
if (byte_num == '1') return GL_BYTE;
|
||||
if (byte_num == '2') return GL_SHORT;
|
||||
break;
|
||||
case 'f':
|
||||
return GL_FLOAT;
|
||||
if (!byte_num) return GL_FLOAT;
|
||||
ATTR_FALLTHROUGH;
|
||||
case 'd':
|
||||
return GL_DOUBLE;
|
||||
if (!byte_num || byte_num == '8') return GL_DOUBLE;
|
||||
if (byte_num == '4') return GL_FLOAT;
|
||||
break;
|
||||
}
|
||||
return -1; /* UNKNOWN */
|
||||
}
|
||||
@ -786,9 +801,9 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (type != gl_buffer_type_from_py_format_char(*pybuffer.format)) {
|
||||
if (type != gl_buffer_type_from_py_format_char(pybuffer.format)) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"`GL_TYPE` and `format` of object with buffer interface do not match");
|
||||
"`GL_TYPE` and `typestr` of object with buffer interface do not match. '%s'", pybuffer.format);
|
||||
}
|
||||
else if (ndimensions != pybuffer.ndim ||
|
||||
!compare_dimensions(ndimensions, dimensions, pybuffer.shape))
|
||||
|
Loading…
Reference in New Issue
Block a user