griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.1-release'

Browse Source
This commit is contained in:
Clément Foucault
2022-02-01 19:25:36 +01:00
parent f39ade9e00 83b6c8f2b1
commit 2b01964e6c
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/editors/gpencil/gpencil_edit.c
View File

@@ -4626,6 +4626,31 @@ static int gpencil_stroke_separate_exec(bContext *C, wmOperator *op)
BKE_report(op->reports, RPT_ERROR, "Not implemented!");
}
else {
/* Check if all points are selected. */
bool all_points_selected = true;
for (i = 0, pt = gps->points; i < gps->totpoints; i++, pt++) {
if ((pt->flag & GP_SPOINT_SELECT) == 0) {
all_points_selected = false;
break;
}
}
/* Separate the entrie stroke. */
if (all_points_selected) {
/* deselect old stroke */
gps->flag &= ~GP_STROKE_SELECT;
BKE_gpencil_stroke_select_index_reset(gps);
/* unlink from source frame */
BLI_remlink(&gpf->strokes, gps);
gps->prev = gps->next = NULL;
/* relink to destination frame */
BLI_addtail(&gpf_dst->strokes, gps);
/* Reassign material. */
gps->mat_nr = idx;
continue;
}
/* make copy of source stroke */
bGPDstroke *gps_dst = BKE_gpencil_stroke_duplicate(gps, true, true);

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

@@ -415,11 +415,13 @@ std::string GLShader::resources_declare(const ShaderCreateInfo &info) const
}
ss << ";\n";
}
#if 0 /* T95278: This is not be enough to prevent some compilers think it is recursive. */
for (const ShaderCreateInfo::PushConst &uniform : info.push_constants_) {
/* T95278: Double macro to avoid some compilers think it is recursive. */
ss << "#define " << uniform.name << "_ " << uniform.name << "\n";
ss << "#define " << uniform.name << " (" << uniform.name << "_)\n";
}
#endif
ss << "\n";
return ss.str();
}