griefith/test2
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:
Bastien Montagne
2024-10-09 15:59:01 +02:00
parent cf954b1d8d e2705a432a
commit 2b72cccc85
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/startup/bl_operators/wm.py
View File

@@ -2809,7 +2809,7 @@ class WM_OT_batch_rename(Operator):
@classmethod
def _data_from_context(cls, context, data_type, only_selected, *, check_context=False):
def _is_editable(data):
return data.is_editable and not data.override_library
return data.id_data.is_editable and not data.id_data.override_library
mode = context.mode
scene = context.scene
@@ -3008,7 +3008,7 @@ class WM_OT_batch_rename(Operator):
"name",
descr,
)
data = ([id for id in data[0] if _is_editable(id)], data[1], data[2])
data = ([it for it in data[0] if _is_editable(it)], data[1], data[2])
return data

2
source/blender/blenkernel/intern/paint.cc
View File

@@ -847,7 +847,7 @@ static void paint_brush_default_essentials_name_get(
}
break;
case OB_MODE_VERTEX_PAINT:
name = "Paint";
name = "Paint Hard";
if (brush_type) {
switch (eBrushVertexPaintType(*brush_type)) {
case VPAINT_BRUSH_TYPE_BLUR: