blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Philipp Oeser 2018-05-24 09:03:07 +02:00
parent 569a5e0d7c 1318660b04
commit d7824de8e4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/interface/interface_handlers.c
View File

@ -1596,6 +1596,7 @@ static void ui_selectcontext_apply(
bool b;
int i;
float f;
PointerRNA p;
} delta, min, max;
const bool is_array = RNA_property_array_check(prop);
@ -1620,6 +1621,9 @@ static void ui_selectcontext_apply(
delta.b = RNA_property_boolean_get(&but->rnapoin, prop); /* not a delta infact */
}
}
else if (rna_type == PROP_POINTER) {
delta.p = RNA_property_pointer_get(&but->rnapoin, prop); /* not a delta infact */
}
#ifdef USE_ALLSELECT_LAYER_HACK
/* make up for not having 'handle_layer_buttons' */
@ -1692,6 +1696,10 @@ static void ui_selectcontext_apply(
BLI_assert(!is_array);
RNA_property_enum_set(&lptr, lprop, other_value);
}
else if (rna_type == PROP_POINTER) {
const PointerRNA other_value = delta.p;
RNA_property_pointer_set(&lptr, lprop, other_value);
}
RNA_property_update(C, &lptr, prop);
}