blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 782 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Antonio Vazquez 2020-11-03 16:39:27 +01:00
parent 6fdcca8de6 0cf46631e1
commit 5deb2d42d9
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/gpencil/gpencil_merge.c
View File

@ -413,7 +413,7 @@ static int gpencil_analyze_strokes(tGPencilPointCache *src_array,
BLI_ghash_free(strokes, NULL, NULL);
/* add the stroke to array */
if (gps->next != NULL) {
if (gps_next != NULL) {
BLI_ghash_insert(all_strokes, gps_next, gps_next);
last = gpencil_insert_to_array(src_array, dst_array, totpoints, gps_next, reverse, last);
/* replace last end */

2
source/blender/gpu/opengl/gl_framebuffer.cc
View File

@ -288,7 +288,7 @@ void GLFrameBuffer::bind(bool enabled_srgb)
if (context_->active_fb != this || enabled_srgb_ != enabled_srgb) {
enabled_srgb_ = enabled_srgb;
if (enabled_srgb) {
if (enabled_srgb && srgb_) {
glEnable(GL_FRAMEBUFFER_SRGB);
}
else {

6
source/blender/modifiers/intern/MOD_volume_to_mesh.cc
View File

@ -237,7 +237,8 @@ static Mesh *new_mesh_from_openvdb_data(Span<openvdb::Vec3s> verts,
mesh->mpoly[i].loopstart = 3 * i;
mesh->mpoly[i].totloop = 3;
for (int j = 0; j < 3; j++) {
mesh->mloop[3 * i + j].v = tris[i][j];
/* Reverse vertex order to get correct normals. */
mesh->mloop[3 * i + j].v = tris[i][2 - j];
}
}
@ -248,7 +249,8 @@ static Mesh *new_mesh_from_openvdb_data(Span<openvdb::Vec3s> verts,
mesh->mpoly[poly_offset + i].loopstart = loop_offset + 4 * i;
mesh->mpoly[poly_offset + i].totloop = 4;
for (int j = 0; j < 4; j++) {
mesh->mloop[loop_offset + 4 * i + j].v = quads[i][j];
/* Reverse vertex order to get correct normals. */
mesh->mloop[loop_offset + 4 * i + j].v = quads[i][3 - j];
}
}

4
source/blender/nodes/intern/node_socket.cc
View File

@ -543,8 +543,8 @@ static bNodeSocketType *make_socket_type_virtual(void)
ED_init_node_socket_type_virtual(stype);
stype->use_link_limits_of_type = true;
stype->input_link_limit = 1;
stype->output_link_limit = 1;
stype->input_link_limit = 0xFFF;
stype->output_link_limit = 0xFFF;
return stype;
}