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

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-10-04 12:07:18 +10:00
parent 1e577c3e52 0b8ce96bc1
commit 3c8317e640
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc
View File

@@ -66,7 +66,7 @@ bool editable_grease_pencil_point_selection_poll(bContext *C)
return (ts->gpencil_selectmode_edit != GP_SELECTMODE_STROKE);
}
bool grease_pencil_selection_poll(bContext *C)
static bool grease_pencil_selection_poll(bContext *C)
{
if (!active_grease_pencil_poll(C)) {
return false;
@@ -100,7 +100,7 @@ bool grease_pencil_painting_poll(bContext *C)
return true;
}
bool grease_pencil_edit_poll(bContext *C)
static bool grease_pencil_edit_poll(bContext *C)
{
if (!active_grease_pencil_poll(C)) {
return false;

2
source/blender/io/usd/usd.hh
View File

@@ -38,7 +38,7 @@ enum eUSDMtlNameCollisionMode {
};
/* Enums specifying the USD material purpose,
* corresponding to pxr::UsdShadeTokens 'allPurpose',
* corresponding to #pxr::UsdShadeTokens 'allPurpose',
* 'preview', and 'render', respectively. */
enum eUSDMtlPurpose {
USD_MTL_PURPOSE_ALL = 0,