From 4e907829d3d2cf7876d5e03d59831d9238951895 Mon Sep 17 00:00:00 2001 From: Pratik Borhade Date: Tue, 12 Nov 2024 12:07:59 +0100 Subject: [PATCH 1/2] Fix #128099: Outliner isolate collection tweaks linked data Mistake in e494a4402403b0e3ab443eff4bebd1ba049815f6 Even though collection/object PointerRNA argument is same in most cases, use `layer_or_collection_prop` in if() before assigning value to collection property (`base_or_object_prop`argument value is null in function call from `_isolate_flag()`). Pull Request: https://projects.blender.org/blender/blender/pulls/129250 --- source/blender/editors/space_outliner/outliner_draw.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 3a4c3d90648..c8daaf854b5 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -378,7 +378,7 @@ static void outliner_collection_set_flag_recursive(Scene *scene, } PointerRNA ptr; outliner_layer_or_collection_pointer_create(scene, layer_collection, collection, &ptr); - if (base_or_object_prop && !RNA_property_editable(&ptr, base_or_object_prop)) { + if (layer_or_collection_prop && !RNA_property_editable(&ptr, layer_or_collection_prop)) { return; } From dda364637c13f76a2b017a2e44778b1f8bdee045 Mon Sep 17 00:00:00 2001 From: Pratik Borhade Date: Tue, 12 Nov 2024 12:08:53 +0100 Subject: [PATCH 2/2] Fix #130059: Rigify Limb menu disppears for some rotation fields Caused by 78b9218c9851aaa5b438141cd8009911f87a1628 Undefined `iface_` is used, this terminates execution of further UI panel draw code. Fix this by importing iface_ from module. Pull Request: https://projects.blender.org/blender/blender/pulls/130063 --- scripts/addons_core/rigify/rigs/limbs/limb_rigs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py b/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py index abf24bbfefa..347124e480d 100644 --- a/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py +++ b/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py @@ -28,6 +28,7 @@ from math import pi from itertools import count from mathutils import Vector +from bpy.app.translations import pgettext_iface as iface_ class SegmentEntry(NamedTuple): org: str # ORG bone