Cleanup: indentation
This commit is contained in:
parent
060adfbd1b
commit
95f2604ea7
Notes:
blender-bot
2023-02-14 05:12:58 +01:00
Referenced by issue #57156, blender2.8: installation is only showing CUDA options as render device in menu after copying script files from stable build
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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", ""},
|
||||
|
|
Loading…
Reference in New Issue