Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-15 09:44:50 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-15 09:44:50 +0300
commit49cd13768f4435ca4d109768e5a6a96db21404ee (patch)
treeab71d3734c20988219c8c1512304cc9a0fa6d4f1 /source/blender/editors/object/object_add.c
parent7c0336586102f5ba860c632e762b9317a1bfec20 (diff)
UI: 'Add Object' rename dimensions
D3943 by @Zachman w/ edits
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 772199b8d91..0a16a62d788 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -30,6 +30,7 @@
#include <stdlib.h>
#include <string.h>
+#include <ctype.h>
#include "MEM_guardedalloc.h"
@@ -273,7 +274,12 @@ static void view_align_update(struct Main *UNUSED(main), struct Scene *UNUSED(sc
RNA_struct_idprops_unset(ptr, "rotation");
}
-void ED_object_add_unit_props(wmOperatorType *ot)
+void ED_object_add_unit_props_size(wmOperatorType *ot)
+{
+ RNA_def_float_distance(ot->srna, "size", 2.0f, 0.0, OBJECT_ADD_SIZE_MAXF, "Size", "", 0.001, 100.00);
+}
+
+void ED_object_add_unit_props_radius(wmOperatorType *ot)
{
RNA_def_float_distance(ot->srna, "radius", 1.0f, 0.0, OBJECT_ADD_SIZE_MAXF, "Radius", "", 0.001, 100.00);
}
@@ -457,7 +463,7 @@ void OBJECT_OT_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
RNA_def_enum(ot->srna, "type", rna_enum_object_type_items, 0, "Type", "");
ED_object_add_generic_props(ot, true);
@@ -541,7 +547,7 @@ void OBJECT_OT_lightprobe_add(wmOperatorType *ot)
/* properties */
ot->prop = RNA_def_enum(ot->srna, "type", lightprobe_type_items, 0, "Type", "");
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, true);
}
@@ -609,7 +615,7 @@ void OBJECT_OT_effector_add(wmOperatorType *ot)
/* properties */
ot->prop = RNA_def_enum(ot->srna, "type", field_type_items, 0, "Type", "");
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, true);
}
@@ -725,7 +731,7 @@ void OBJECT_OT_metaball_add(wmOperatorType *ot)
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_metaelem_type_items, 0, "Primitive", "");
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, true);
}
@@ -767,7 +773,7 @@ void OBJECT_OT_text_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, true);
}
@@ -827,7 +833,7 @@ void OBJECT_OT_armature_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, true);
}
@@ -869,7 +875,7 @@ void OBJECT_OT_empty_add(wmOperatorType *ot)
/* properties */
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_object_empty_drawtype_items, 0, "Type", "");
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, false);
}
@@ -1051,7 +1057,7 @@ void OBJECT_OT_gpencil_add(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
/* properties */
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, false);
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_object_gpencil_type_items, 0, "Type", "");
@@ -1130,7 +1136,7 @@ void OBJECT_OT_light_add(wmOperatorType *ot)
ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_light_type_items, 0, "Type", "");
RNA_def_property_translation_context(ot->prop, BLT_I18NCONTEXT_ID_LAMP);
- ED_object_add_unit_props(ot);
+ ED_object_add_unit_props_radius(ot);
ED_object_add_generic_props(ot, false);
}