blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2021-01-04 12:00:00 +11:00
parent c61c7d9926
commit 9b10b3930b
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_device.cpp
View File

@ -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;

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

@ -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 */

3
source/blender/makesrna/intern/rna_image.c
View File

@ -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");