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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-03-07 15:18:14 +11:00
parent c33b423509 f7ba05991f
commit e9b4f13304
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/object/object_constraint.cc
View File

@@ -784,6 +784,9 @@ static bool edit_constraint_invoke_properties(bContext *C,
}
}
if (r_retval != nullptr) {
*r_retval = OPERATOR_CANCELLED;
}
return false;
}

12
source/blender/editors/render/render_shading.cc
View File

@@ -947,9 +947,17 @@ static int view_layer_add_exec(bContext *C, wmOperator *op)
{
wmWindow *win = CTX_wm_window(C);
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer_current = WM_window_get_active_view_layer(win);
ViewLayer *view_layer_current = win ? WM_window_get_active_view_layer(win) : nullptr;
int type = RNA_enum_get(op->ptr, "type");
/* Copy requires a source. */
if (type == VIEWLAYER_ADD_COPY) {
if (view_layer_current == nullptr) {
type = VIEWLAYER_ADD_NEW;
}
}
ViewLayer *view_layer_new = BKE_view_layer_add(
scene, view_layer_current->name, view_layer_current, RNA_enum_get(op->ptr, "type"));
scene, view_layer_current ? view_layer_current->name : nullptr, view_layer_current, type);
if (win) {
WM_window_set_active_view_layer(win, view_layer_new);