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

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2023-05-03 11:15:09 +10:00
parent d5fc1b9ba4
commit 381de3bd9e
4 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/node.cc
View File

@@ -2540,7 +2540,8 @@ void node_socket_move_default_value(Main & /*bmain*/,
SOCK_IMAGE,
SOCK_MATERIAL,
SOCK_TEXTURE,
SOCK_OBJECT)) {
SOCK_OBJECT))
{
src_type.value_initialize(src_value);
}
}

5
source/blender/editors/space_outliner/tree/tree_element_overrides.cc
View File

@@ -228,10 +228,7 @@ TreeElementOverridesPropertyOperation::TreeElementOverridesPropertyOperation(
StringRefNull TreeElementOverridesPropertyOperation::getOverrideOperationLabel() const
{
if (ELEM(operation_->operation,
LIBOVERRIDE_OP_INSERT_AFTER,
LIBOVERRIDE_OP_INSERT_BEFORE))
{
if (ELEM(operation_->operation, LIBOVERRIDE_OP_INSERT_AFTER, LIBOVERRIDE_OP_INSERT_BEFORE)) {
return TIP_("Added through override");
}

11
source/blender/makesrna/intern/rna_access_compare_override.c
View File

@@ -498,10 +498,8 @@ static bool rna_property_override_operation_store(Main *bmain,
LISTBASE_FOREACH (IDOverrideLibraryPropertyOperation *, opop, &op->operations) {
/* Only needed for diff operations. */
if (!ELEM(opop->operation,
LIBOVERRIDE_OP_ADD,
LIBOVERRIDE_OP_SUBTRACT,
LIBOVERRIDE_OP_MULTIPLY))
if (!ELEM(
opop->operation, LIBOVERRIDE_OP_ADD, LIBOVERRIDE_OP_SUBTRACT, LIBOVERRIDE_OP_MULTIPLY))
{
continue;
}
@@ -1175,9 +1173,8 @@ static void rna_property_override_apply_ex(Main *bmain,
continue;
}
if (!do_insert != !ELEM(opop->operation,
LIBOVERRIDE_OP_INSERT_AFTER,
LIBOVERRIDE_OP_INSERT_BEFORE))
if (!do_insert !=
!ELEM(opop->operation, LIBOVERRIDE_OP_INSERT_AFTER, LIBOVERRIDE_OP_INSERT_BEFORE))
{
if (!do_insert) {
CLOG_INFO(&LOG, 5, "Skipping insert override operations in first pass (%s)", op->rna_path);

29
source/blender/makesrna/intern/rna_rna.c
View File

@@ -1945,9 +1945,7 @@ int rna_property_override_diff_default(Main *bmain,
op = BKE_lib_override_library_property_find(override, rna_path);
if (op != NULL) {
LISTBASE_FOREACH_MUTABLE (IDOverrideLibraryPropertyOperation *, opop, &op->operations) {
if (ELEM(opop->operation,
LIBOVERRIDE_OP_INSERT_AFTER,
LIBOVERRIDE_OP_INSERT_BEFORE)) {
if (ELEM(opop->operation, LIBOVERRIDE_OP_INSERT_AFTER, LIBOVERRIDE_OP_INSERT_BEFORE)) {
BKE_lib_override_library_property_operation_delete(op, opop);
}
}
@@ -2175,10 +2173,7 @@ bool rna_property_override_store_default(Main *UNUSED(bmain),
const bool is_array = len_local > 0;
const int index = is_array ? opop->subitem_reference_index : 0;
if (!ELEM(opop->operation,
LIBOVERRIDE_OP_ADD,
LIBOVERRIDE_OP_SUBTRACT,
LIBOVERRIDE_OP_MULTIPLY))
if (!ELEM(opop->operation, LIBOVERRIDE_OP_ADD, LIBOVERRIDE_OP_SUBTRACT, LIBOVERRIDE_OP_MULTIPLY))
{
return changed;
}
@@ -2212,9 +2207,8 @@ bool rna_property_override_store_default(Main *UNUSED(bmain),
case LIBOVERRIDE_OP_ADD:
case LIBOVERRIDE_OP_SUBTRACT: {
const int fac = opop->operation == LIBOVERRIDE_OP_ADD ? 1 : -1;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ?
LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ? LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
bool do_set = true;
array_b = (len_local > RNA_STACK_ARRAY) ?
MEM_mallocN(sizeof(*array_b) * len_local, __func__) :
@@ -2262,9 +2256,8 @@ bool rna_property_override_store_default(Main *UNUSED(bmain),
case LIBOVERRIDE_OP_ADD:
case LIBOVERRIDE_OP_SUBTRACT: {
const int fac = opop->operation == LIBOVERRIDE_OP_ADD ? 1 : -1;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ?
LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ? LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
int b = fac * (RNA_PROPERTY_GET_SINGLE(int, ptr_local, prop_local, index) - value);
if (b < prop_min || b > prop_max) {
opop->operation = other_op;
@@ -2302,9 +2295,8 @@ bool rna_property_override_store_default(Main *UNUSED(bmain),
case LIBOVERRIDE_OP_ADD:
case LIBOVERRIDE_OP_SUBTRACT: {
const float fac = opop->operation == LIBOVERRIDE_OP_ADD ? 1.0 : -1.0;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ?
LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ? LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
bool do_set = true;
array_b = (len_local > RNA_STACK_ARRAY) ?
MEM_mallocN(sizeof(*array_b) * len_local, __func__) :
@@ -2375,9 +2367,8 @@ bool rna_property_override_store_default(Main *UNUSED(bmain),
case LIBOVERRIDE_OP_ADD:
case LIBOVERRIDE_OP_SUBTRACT: {
const float fac = opop->operation == LIBOVERRIDE_OP_ADD ? 1.0f : -1.0f;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ?
LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
const int other_op = opop->operation == LIBOVERRIDE_OP_ADD ? LIBOVERRIDE_OP_SUBTRACT :
LIBOVERRIDE_OP_ADD;
float b = fac * (RNA_PROPERTY_GET_SINGLE(float, ptr_local, prop_local, index) - value);
if (b < prop_min || b > prop_max) {
opop->operation = other_op;