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:
Bastien Montagne
2024-11-07 18:27:34 +01:00
parent ba94dbc9c2 320c77b963
commit b0842c24b6
4 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ IDTypeInfo IDType_ID_SCR = {
/*name_plural*/ N_("screens"),
/*translation_context*/ BLT_I18NCONTEXT_ID_SCREEN,
/*flags*/ IDTYPE_FLAGS_NO_COPY | IDTYPE_FLAGS_ONLY_APPEND | IDTYPE_FLAGS_NO_ANIMDATA |
IDTYPE_FLAGS_NO_MEMFILE_UNDO | IDTYPE_FLAGS_NEVER_UNUSED,
IDTYPE_FLAGS_NO_MEMFILE_UNDO,
/*asset_type_info*/ nullptr,
/*init_data*/ nullptr,

6
source/blender/editors/screen/workspace_edit.cc
View File

@@ -257,6 +257,12 @@ bool ED_workspace_delete(WorkSpace *workspace, Main *bmain, bContext *C, wmWindo
}
}
/* Also delete managed sceens if they have no other users. */
LISTBASE_FOREACH (WorkSpaceLayout *, layout, &workspace->layouts) {
BKE_id_free_us(bmain, layout->screen);
layout->screen = nullptr;
}
BKE_id_free(bmain, &workspace->id);
return true;
}

1
source/blender/nodes/CMakeLists.txt
View File

@@ -53,6 +53,7 @@ set(INC
intern
shader
texture
../animrig
../editors/include
../blenkernel
../blenloader

19
source/blender/nodes/intern/inverse_eval.cc
View File

@@ -11,6 +11,7 @@
#include "NOD_value_elem_eval.hh"
#include "BKE_compute_contexts.hh"
#include "BKE_context.hh"
#include "BKE_idprop.hh"
#include "BKE_modifier.hh"
#include "BKE_node.hh"
@@ -33,6 +34,8 @@
#include "MOD_nodes.hh"
#include "ANIM_keyframing.hh"
namespace blender::nodes::inverse_eval {
using namespace value_elem;
@@ -378,6 +381,10 @@ static bool set_rna_property(bContext &C,
const PropertyType dst_type = RNA_property_type(prop);
const int array_len = RNA_property_array_length(&value_ptr, prop);
Scene *scene = CTX_data_scene(&C);
const bool only_when_keyed = blender::animrig::is_keying_flag(scene,
AUTOKEY_FLAG_INSERTAVAILABLE);
switch (dst_type) {
case PROP_FLOAT: {
float value = std::visit([](auto v) { return float(v); }, value_variant);
@@ -387,11 +394,15 @@ static bool set_rna_property(bContext &C,
if (array_len == 0) {
RNA_property_float_set(&value_ptr, prop, value);
RNA_property_update(&C, &value_ptr, prop);
animrig::autokeyframe_property(
&C, scene, &value_ptr, prop, 0, scene->r.cfra, only_when_keyed);
return true;
}
if (index >= 0 && index < array_len) {
RNA_property_float_set_index(&value_ptr, prop, index, value);
RNA_property_update(&C, &value_ptr, prop);
animrig::autokeyframe_property(
&C, scene, &value_ptr, prop, index, scene->r.cfra, only_when_keyed);
return true;
}
break;
@@ -404,11 +415,15 @@ static bool set_rna_property(bContext &C,
if (array_len == 0) {
RNA_property_int_set(&value_ptr, prop, value);
RNA_property_update(&C, &value_ptr, prop);
animrig::autokeyframe_property(
&C, scene, &value_ptr, prop, 0, scene->r.cfra, only_when_keyed);
return true;
}
if (index >= 0 && index < array_len) {
RNA_property_int_set_index(&value_ptr, prop, index, value);
RNA_property_update(&C, &value_ptr, prop);
animrig::autokeyframe_property(
&C, scene, &value_ptr, prop, index, scene->r.cfra, only_when_keyed);
return true;
}
break;
@@ -418,11 +433,15 @@ static bool set_rna_property(bContext &C,
if (array_len == 0) {
RNA_property_boolean_set(&value_ptr, prop, value);
RNA_property_update(&C, &value_ptr, prop);
animrig::autokeyframe_property(
&C, scene, &value_ptr, prop, 0, scene->r.cfra, only_when_keyed);
return true;
}
if (index >= 0 && index < array_len) {
RNA_property_boolean_set_index(&value_ptr, prop, index, value);
RNA_property_update(&C, &value_ptr, prop);
animrig::autokeyframe_property(
&C, scene, &value_ptr, prop, index, scene->r.cfra, only_when_keyed);
return true;
}
break;