blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: avoid the possibility of 'enter_editmode' being left unset 

While in practice this isn't an issue currently, always set
'enter_editmode' in ED_object_add_generic_get_opts
to avoid problems in the future.
This commit is contained in:
Campbell Barton 2021-06-13 14:47:07 +10:00
parent 84e98ba182
commit 9ff4e0068f
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/editors/object/object_add.c
View File

@ -463,21 +463,25 @@ bool ED_object_add_generic_get_opts(bContext *C,
ushort *local_view_bits,
bool *is_view_aligned)
{
PropertyRNA *prop;
/* Switch to Edit mode? optional prop */
if ((prop = RNA_struct_find_property(op->ptr, "enter_editmode"))) {
/* Edit Mode! (optional) */
{
bool _enter_editmode;
if (!enter_editmode) {
enter_editmode = &_enter_editmode;
}
/* Only to ensure the value is _always_ set.
* Typically the property will exist when the argument is non-NULL. */
*enter_editmode = false;
if (RNA_property_is_set(op->ptr, prop) && enter_editmode) {
*enter_editmode = RNA_property_boolean_get(op->ptr, prop);
}
else {
*enter_editmode = (U.flag & USER_ADD_EDITMODE) != 0;
RNA_property_boolean_set(op->ptr, prop, *enter_editmode);
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "enter_editmode");
if (prop != NULL) {
if (RNA_property_is_set(op->ptr, prop) && enter_editmode) {
*enter_editmode = RNA_property_boolean_get(op->ptr, prop);
}
else {
*enter_editmode = (U.flag & USER_ADD_EDITMODE) != 0;
RNA_property_boolean_set(op->ptr, prop, *enter_editmode);
}
}
}
@ -522,7 +526,7 @@ bool ED_object_add_generic_get_opts(bContext *C,
}
else {
int alignment = ALIGN_WORLD;
prop = RNA_struct_find_property(op->ptr, "align");
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "align");
if (RNA_property_is_set(op->ptr, prop)) {
/* If alignment is set, always use it. */
@ -574,7 +578,9 @@ bool ED_object_add_generic_get_opts(bContext *C,
/* For now this is optional, we can make it always use. */
copy_v3_fl(scale, 1.0f);
if ((prop = RNA_struct_find_property(op->ptr, "scale"))) {
PropertyRNA *prop = RNA_struct_find_property(op->ptr, "scale");
if (prop != NULL) {
if (RNA_property_is_set(op->ptr, prop)) {
RNA_property_float_get_array(op->ptr, prop, scale);
}