diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 00:20:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-11 00:20:35 +0300 |
commit | 95f2604ea7b32d034cce7c7ec46149eaf6174d47 (patch) | |
tree | f411c51fa11fe9f742a78233ac1d5607d9ba2232 /source/blender | |
parent | 060adfbd1b85277a1f7c4b32e2d26e6922e5af0a (diff) |
Cleanup: indentation
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/gpencil.c | 4 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 4 | ||||
-rw-r--r-- | source/blender/editors/include/UI_icons.h | 12 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_icons.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 8 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 |
8 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 559d4ef3bef..33c2587e800 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1088,8 +1088,8 @@ Material *BKE_gpencil_material_ensure(Main *bmain, Object *ob) * \return Returns whether we found any selected points */ bool BKE_gpencil_stroke_minmax( - const bGPDstroke *gps, const bool use_select, - float r_min[3], float r_max[3]) + const bGPDstroke *gps, const bool use_select, + float r_min[3], float r_max[3]) { const bGPDspoint *pt; int i; diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 0bed4e3f4b3..9b9edff7685 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -348,12 +348,12 @@ static DRWCallState *drw_call_state_create(DRWShadingGroup *shgroup, float (*obm if ((state->matflag & DRW_CALL_OBJECTINFO) != 0) { state->objectinfo[0] = ob ? ob->index : 0; unsigned int random; - #if 0 /* TODO(fclem) handle dupli objects */ +#if 0 /* TODO(fclem) handle dupli objects */ if (GMS.dob) { random = GMS.dob->random_id; } else - #endif +#endif { random = BLI_hash_int_2d(BLI_hash_string(ob->id.name + 2), 0); } diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index d6abfe6026a..a463cfdb633 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -32,22 +32,22 @@ /* Auto define more specific types for places that do not need the distinction. */ #ifndef DEF_ICON_COLLECTION - #define DEF_ICON_COLLECTION DEF_ICON +# define DEF_ICON_COLLECTION DEF_ICON #endif #ifndef DEF_ICON_OBJECT - #define DEF_ICON_OBJECT DEF_ICON +# define DEF_ICON_OBJECT DEF_ICON #endif #ifndef DEF_ICON_OBJECT_DATA - #define DEF_ICON_OBJECT_DATA DEF_ICON +# define DEF_ICON_OBJECT_DATA DEF_ICON #endif #ifndef DEF_ICON_MODIFIER - #define DEF_ICON_MODIFIER DEF_ICON +# define DEF_ICON_MODIFIER DEF_ICON #endif #ifndef DEF_ICON_SHADING - #define DEF_ICON_SHADING DEF_ICON +# define DEF_ICON_SHADING DEF_ICON #endif #ifndef DEF_ICON_COLOR - #define DEF_ICON_COLOR DEF_ICON +# define DEF_ICON_COLOR DEF_ICON #endif /* ICON_ prefix added */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index bedc4ac92cf..0c5eb35f939 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -1680,8 +1680,8 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id) /* reset the icon */ if ((ob != NULL) && - (ob->mode & OB_MODE_GPENCIL_PAINT) && - (br->gpencil_settings != NULL)) + (ob->mode & OB_MODE_GPENCIL_PAINT) && + (br->gpencil_settings != NULL)) { switch (br->gpencil_settings->icon_id) { case GP_BRUSH_ICON_PENCIL: diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 84136f657ef..0174e139c0a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2858,7 +2858,7 @@ static int viewselected_exec(bContext *C, wmOperator *op) add_v3_v3(min, ob_eval->obmat[3]); add_v3_v3(max, ob_eval->obmat[3]); } - } + } else if (ob_eval && (ob_eval->type == OB_GPENCIL)) { ok |= BKE_gpencil_data_minmax(ob_eval, gpd, min, max); } diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c index 7f4f3d888fc..48006874e34 100644 --- a/source/blender/editors/transform/transform_snap_object.c +++ b/source/blender/editors/transform/transform_snap_object.c @@ -757,7 +757,7 @@ static bool raycastObj( break; } else if (em->mesh_eval_final && - (em->mesh_eval_final->runtime.deformed_only == false)) + (em->mesh_eval_final->runtime.deformed_only == false)) { me = em->mesh_eval_final; } @@ -2270,7 +2270,7 @@ static short snapObject( break; } else if (em->mesh_eval_final && - (em->mesh_eval_final->runtime.deformed_only == false)) + (em->mesh_eval_final->runtime.deformed_only == false)) { me = em->mesh_eval_final; } diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index b77a77fa0a1..f576ad4866c 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1179,19 +1179,19 @@ static void rna_def_charinfo(BlenderRNA *brna) prop = RNA_def_property(srna, "use_bold", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_BOLD); RNA_def_property_ui_text(prop, "Bold", ""); - RNA_def_property_ui_icon(prop, ICON_BOLD, 0); + RNA_def_property_ui_icon(prop, ICON_BOLD, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_italic", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_ITALIC); RNA_def_property_ui_text(prop, "Italic", ""); - RNA_def_property_ui_icon(prop, ICON_ITALIC, 0); + RNA_def_property_ui_icon(prop, ICON_ITALIC, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_underline", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_UNDERLINE); RNA_def_property_ui_text(prop, "Underline", ""); - RNA_def_property_ui_icon(prop, ICON_UNDERLINE, 0); + RNA_def_property_ui_icon(prop, ICON_UNDERLINE, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* probably there is no reason to expose this */ @@ -1205,7 +1205,7 @@ static void rna_def_charinfo(BlenderRNA *brna) prop = RNA_def_property(srna, "use_small_caps", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_CHINFO_SMALLCAPS); RNA_def_property_ui_text(prop, "Small Caps", ""); - RNA_def_property_ui_icon(prop, ICON_SMALL_CAPS, 0); + RNA_def_property_ui_icon(prop, ICON_SMALL_CAPS, 0); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "material_index", PROP_INT, PROP_UNSIGNED); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index aec0c016fa8..4f366fa36c4 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -104,8 +104,8 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MODIFIER, "Shrinkwrap", ""}, {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MODIFIER, "Simple Deform", ""}, {eModifierType_Smooth, "SMOOTH", ICON_MODIFIER, "Smooth", ""}, - {eModifierType_CorrectiveSmooth, "CORRECTIVE_SMOOTH", ICON_MODIFIER, "Smooth Corrective", ""}, - {eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MODIFIER, "Smooth Laplacian", ""}, + {eModifierType_CorrectiveSmooth, "CORRECTIVE_SMOOTH", ICON_MODIFIER, "Smooth Corrective", ""}, + {eModifierType_LaplacianSmooth, "LAPLACIANSMOOTH", ICON_MODIFIER, "Smooth Laplacian", ""}, {eModifierType_SurfaceDeform, "SURFACE_DEFORM", ICON_MODIFIER, "Surface Deform", ""}, {eModifierType_Warp, "WARP", ICON_MODIFIER, "Warp", ""}, {eModifierType_Wave, "WAVE", ICON_MODIFIER, "Wave", ""}, |