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:
-rw-r--r--intern/cycles/blender/blender_device.cpp2
-rw-r--r--source/blender/editors/object/object_add.c7
-rw-r--r--source/blender/makesrna/intern/rna_image.c3
3 files changed, 8 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_device.cpp b/intern/cycles/blender/blender_device.cpp
index 07c99ca0228..3ec77719bea 100644
--- a/intern/cycles/blender/blender_device.cpp
+++ b/intern/cycles/blender/blender_device.cpp
@@ -49,7 +49,7 @@ DeviceInfo blender_device_info(BL::Preferences &b_preferences, BL::Scene &b_scen
PointerRNA cpreferences;
BL::Preferences::addons_iterator b_addon_iter;
for (b_preferences.addons.begin(b_addon_iter); b_addon_iter != b_preferences.addons.end();
- ++b_addon_iter) {
+ ++b_addon_iter) {
if (b_addon_iter->module() == "cycles") {
cpreferences = b_addon_iter->preferences().ptr;
break;
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 32502db8766..03ff8808423 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -323,8 +323,11 @@ void ED_object_add_generic_props(wmOperatorType *ot, bool do_editmode)
PropertyRNA *prop;
if (do_editmode) {
- prop = RNA_def_boolean(
- ot->srna, "enter_editmode", 0, "Enter Edit Mode", "Enter edit mode when adding this object");
+ prop = RNA_def_boolean(ot->srna,
+ "enter_editmode",
+ 0,
+ "Enter Edit Mode",
+ "Enter edit mode when adding this object");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
}
/* note: this property gets hidden for add-camera operator */
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 71da6e2003b..1e84ded6cde 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -1118,7 +1118,8 @@ static void rna_def_image(BlenderRNA *brna)
prop = RNA_def_property(srna, "is_float", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_funcs(prop, "rna_Image_is_float_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Is Float", "True if this image is stored in floating-point buffer");
+ RNA_def_property_ui_text(
+ prop, "Is Float", "True if this image is stored in floating-point buffer");
prop = RNA_def_property(srna, "colorspace_settings", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "colorspace_settings");