ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 420 insertions, 398 deletions

diff --git a/source/blender/editors/physics/rigidbody_object.c b/source/blender/editors/physics/rigidbody_object.c
index fd76a1b18f4..2914127f8d8 100644
--- a/source/blender/editors/physics/rigidbody_object.c
+++ b/source/blender/editors/physics/rigidbody_object.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 #include "DNA_object_types.h"
 #include "DNA_rigidbody_types.h"
 #include "DNA_scene_types.h"
@@ -63,73 +62,73 @@
 
 static bool ED_operator_rigidbody_active_poll(bContext *C)
 {
-	if (ED_operator_object_active_editable(C)) {
-		Object *ob = ED_object_active_context(C);
-		return (ob && ob->rigidbody_object);
-	}
-	else
-		return 0;
+  if (ED_operator_object_active_editable(C)) {
+    Object *ob = ED_object_active_context(C);
+    return (ob && ob->rigidbody_object);
+  }
+  else
+    return 0;
 }
 
 static bool ED_operator_rigidbody_add_poll(bContext *C)
 {
-	if (ED_operator_object_active_editable(C)) {
-		Object *ob = ED_object_active_context(C);
-		return (ob && ob->type == OB_MESH);
-	}
-	else
-		return 0;
+  if (ED_operator_object_active_editable(C)) {
+    Object *ob = ED_object_active_context(C);
+    return (ob && ob->type == OB_MESH);
+  }
+  else
+    return 0;
 }
 
 /* ----------------- */
 
 bool ED_rigidbody_object_add(Main *bmain, Scene *scene, Object *ob, int type, ReportList *reports)
 {
-	RigidBodyWorld *rbw = BKE_rigidbody_get_world(scene);
-
-	if (ob->type != OB_MESH) {
-		BKE_report(reports, RPT_ERROR, "Can't add Rigid Body to non mesh object");
-		return false;
-	}
-
-	/* Add rigid body world and group if they don't exist for convenience */
-	if (rbw == NULL) {
-		rbw = BKE_rigidbody_create_world(scene);
-		if (rbw == NULL) {
-			BKE_report(reports, RPT_ERROR, "Can't create Rigid Body world");
-			return false;
-		}
-		BKE_rigidbody_validate_sim_world(scene, rbw, false);
-		scene->rigidbody_world = rbw;
-	}
-	if (rbw->group == NULL) {
-		rbw->group = BKE_collection_add(bmain, NULL, "RigidBodyWorld");
-		id_fake_user_set(&rbw->group->id);
-	}
-
-	/* make rigidbody object settings */
-	if (ob->rigidbody_object == NULL) {
-		ob->rigidbody_object = BKE_rigidbody_create_object(scene, ob, type);
-	}
-	ob->rigidbody_object->type = type;
-	ob->rigidbody_object->flag |= RBO_FLAG_NEEDS_VALIDATE;
-
-	/* add object to rigid body group */
-	BKE_collection_object_add(bmain, rbw->group, ob);
-
-	DEG_relations_tag_update(bmain);
-	DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
-	DEG_id_tag_update(&rbw->group->id, ID_RECALC_COPY_ON_WRITE);
-
-	return true;
+  RigidBodyWorld *rbw = BKE_rigidbody_get_world(scene);
+
+  if (ob->type != OB_MESH) {
+    BKE_report(reports, RPT_ERROR, "Can't add Rigid Body to non mesh object");
+    return false;
+  }
+
+  /* Add rigid body world and group if they don't exist for convenience */
+  if (rbw == NULL) {
+    rbw = BKE_rigidbody_create_world(scene);
+    if (rbw == NULL) {
+      BKE_report(reports, RPT_ERROR, "Can't create Rigid Body world");
+      return false;
+    }
+    BKE_rigidbody_validate_sim_world(scene, rbw, false);
+    scene->rigidbody_world = rbw;
+  }
+  if (rbw->group == NULL) {
+    rbw->group = BKE_collection_add(bmain, NULL, "RigidBodyWorld");
+    id_fake_user_set(&rbw->group->id);
+  }
+
+  /* make rigidbody object settings */
+  if (ob->rigidbody_object == NULL) {
+    ob->rigidbody_object = BKE_rigidbody_create_object(scene, ob, type);
+  }
+  ob->rigidbody_object->type = type;
+  ob->rigidbody_object->flag |= RBO_FLAG_NEEDS_VALIDATE;
+
+  /* add object to rigid body group */
+  BKE_collection_object_add(bmain, rbw->group, ob);
+
+  DEG_relations_tag_update(bmain);
+  DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
+  DEG_id_tag_update(&rbw->group->id, ID_RECALC_COPY_ON_WRITE);
+
+  return true;
 }
 
 void ED_rigidbody_object_remove(Main *bmain, Scene *scene, Object *ob)
 {
-	BKE_rigidbody_remove_object(bmain, scene, ob);
+  BKE_rigidbody_remove_object(bmain, scene, ob);
 
-	DEG_relations_tag_update(bmain);
-	DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
+  DEG_relations_tag_update(bmain);
+  DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
 }
 
 /* ********************************************** */
@@ -139,88 +138,93 @@ void ED_rigidbody_object_remove(Main *bmain, Scene *scene, Object *ob)
 
 static int rigidbody_object_add_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = ED_object_active_context(C);
-	int type = RNA_enum_get(op->ptr, "type");
-	bool changed;
-
-	/* apply to active object */
-	changed = ED_rigidbody_object_add(bmain, scene, ob, type, op->reports);
-
-	if (changed) {
-		/* send updates */
-		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
-		WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
-
-		/* done */
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+  Main *bmain = CTX_data_main(C);
+  Scene *scene = CTX_data_scene(C);
+  Object *ob = ED_object_active_context(C);
+  int type = RNA_enum_get(op->ptr, "type");
+  bool changed;
+
+  /* apply to active object */
+  changed = ED_rigidbody_object_add(bmain, scene, ob, type, op->reports);
+
+  if (changed) {
+    /* send updates */
+    WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+    WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
+
+    /* done */
+    return OPERATOR_FINISHED;
+  }
+  else {
+    return OPERATOR_CANCELLED;
+  }
 }
 
 void RIGIDBODY_OT_object_add(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->idname = "RIGIDBODY_OT_object_add";
-	ot->name = "Add Rigid Body";
-	ot->description = "Add active object as Rigid Body";
-
-	/* callbacks */
-	ot->exec = rigidbody_object_add_exec;
-	ot->poll = ED_operator_rigidbody_add_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_rigidbody_object_type_items, RBO_TYPE_ACTIVE, "Rigid Body Type", "");
+  /* identifiers */
+  ot->idname = "RIGIDBODY_OT_object_add";
+  ot->name = "Add Rigid Body";
+  ot->description = "Add active object as Rigid Body";
+
+  /* callbacks */
+  ot->exec = rigidbody_object_add_exec;
+  ot->poll = ED_operator_rigidbody_add_poll;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* properties */
+  ot->prop = RNA_def_enum(ot->srna,
+                          "type",
+                          rna_enum_rigidbody_object_type_items,
+                          RBO_TYPE_ACTIVE,
+                          "Rigid Body Type",
+                          "");
 }
 
 /* ************ Remove Rigid Body ************** */
 
 static int rigidbody_object_remove_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	Object *ob = ED_object_active_context(C);
-	bool changed = false;
-
-	/* apply to active object */
-	if (!ELEM(NULL, ob, ob->rigidbody_object)) {
-		ED_rigidbody_object_remove(bmain, scene, ob);
-		changed = true;
-	}
-
-	if (changed) {
-		/* send updates */
-		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
-		WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
-
-		/* done */
-		return OPERATOR_FINISHED;
-	}
-	else {
-		BKE_report(op->reports, RPT_ERROR, "Object has no Rigid Body settings to remove");
-		return OPERATOR_CANCELLED;
-	}
+  Main *bmain = CTX_data_main(C);
+  Scene *scene = CTX_data_scene(C);
+  Object *ob = ED_object_active_context(C);
+  bool changed = false;
+
+  /* apply to active object */
+  if (!ELEM(NULL, ob, ob->rigidbody_object)) {
+    ED_rigidbody_object_remove(bmain, scene, ob);
+    changed = true;
+  }
+
+  if (changed) {
+    /* send updates */
+    WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+    WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
+
+    /* done */
+    return OPERATOR_FINISHED;
+  }
+  else {
+    BKE_report(op->reports, RPT_ERROR, "Object has no Rigid Body settings to remove");
+    return OPERATOR_CANCELLED;
+  }
 }
 
 void RIGIDBODY_OT_object_remove(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->idname = "RIGIDBODY_OT_object_remove";
-	ot->name = "Remove Rigid Body";
-	ot->description = "Remove Rigid Body settings from Object";
+  /* identifiers */
+  ot->idname = "RIGIDBODY_OT_object_remove";
+  ot->name = "Remove Rigid Body";
+  ot->description = "Remove Rigid Body settings from Object";
 
-	/* callbacks */
-	ot->exec = rigidbody_object_remove_exec;
-	ot->poll = ED_operator_rigidbody_active_poll;
+  /* callbacks */
+  ot->exec = rigidbody_object_remove_exec;
+  ot->poll = ED_operator_rigidbody_active_poll;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* ********************************************** */
@@ -230,92 +234,96 @@ void RIGIDBODY_OT_object_remove(wmOperatorType *ot)
 
 static int rigidbody_objects_add_exec(bContext *C, wmOperator *op)
 {
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	int type = RNA_enum_get(op->ptr, "type");
-	bool changed = false;
-
-	/* create rigid body objects and add them to the world's group */
-	CTX_DATA_BEGIN(C, Object *, ob, selected_objects) {
-		changed |= ED_rigidbody_object_add(bmain, scene, ob, type, op->reports);
-	}
-	CTX_DATA_END;
-
-	if (changed) {
-		/* send updates */
-		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
-		WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
-
-		/* done */
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+  Main *bmain = CTX_data_main(C);
+  Scene *scene = CTX_data_scene(C);
+  int type = RNA_enum_get(op->ptr, "type");
+  bool changed = false;
+
+  /* create rigid body objects and add them to the world's group */
+  CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+    changed |= ED_rigidbody_object_add(bmain, scene, ob, type, op->reports);
+  }
+  CTX_DATA_END;
+
+  if (changed) {
+    /* send updates */
+    WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+    WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
+
+    /* done */
+    return OPERATOR_FINISHED;
+  }
+  else {
+    return OPERATOR_CANCELLED;
+  }
 }
 
 void RIGIDBODY_OT_objects_add(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->idname = "RIGIDBODY_OT_objects_add";
-	ot->name = "Add Rigid Bodies";
-	ot->description = "Add selected objects as Rigid Bodies";
-
-	/* callbacks */
-	ot->exec = rigidbody_objects_add_exec;
-	ot->poll = ED_operator_rigidbody_add_poll;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_rigidbody_object_type_items, RBO_TYPE_ACTIVE, "Rigid Body Type", "");
+  /* identifiers */
+  ot->idname = "RIGIDBODY_OT_objects_add";
+  ot->name = "Add Rigid Bodies";
+  ot->description = "Add selected objects as Rigid Bodies";
+
+  /* callbacks */
+  ot->exec = rigidbody_objects_add_exec;
+  ot->poll = ED_operator_rigidbody_add_poll;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* properties */
+  ot->prop = RNA_def_enum(ot->srna,
+                          "type",
+                          rna_enum_rigidbody_object_type_items,
+                          RBO_TYPE_ACTIVE,
+                          "Rigid Body Type",
+                          "");
 }
 
 /* ************ Remove Rigid Bodies ************** */
 
 static int rigidbody_objects_remove_exec(bContext *C, wmOperator *UNUSED(op))
 {
-	Main *bmain = CTX_data_main(C);
-	Scene *scene = CTX_data_scene(C);
-	bool changed = false;
-
-	/* apply this to all selected objects... */
-	CTX_DATA_BEGIN(C, Object *, ob, selected_objects)
-	{
-		if (ob->rigidbody_object) {
-			ED_rigidbody_object_remove(bmain, scene, ob);
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-
-	if (changed) {
-		/* send updates */
-		WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
-		WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
-
-		/* done */
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+  Main *bmain = CTX_data_main(C);
+  Scene *scene = CTX_data_scene(C);
+  bool changed = false;
+
+  /* apply this to all selected objects... */
+  CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+    if (ob->rigidbody_object) {
+      ED_rigidbody_object_remove(bmain, scene, ob);
+      changed = true;
+    }
+  }
+  CTX_DATA_END;
+
+  if (changed) {
+    /* send updates */
+    WM_event_add_notifier(C, NC_OBJECT | ND_TRANSFORM, NULL);
+    WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
+
+    /* done */
+    return OPERATOR_FINISHED;
+  }
+  else {
+    return OPERATOR_CANCELLED;
+  }
 }
 
 void RIGIDBODY_OT_objects_remove(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->idname = "RIGIDBODY_OT_objects_remove";
-	ot->name = "Remove Rigid Bodies";
-	ot->description = "Remove selected objects from Rigid Body simulation";
+  /* identifiers */
+  ot->idname = "RIGIDBODY_OT_objects_remove";
+  ot->name = "Remove Rigid Bodies";
+  ot->description = "Remove selected objects from Rigid Body simulation";
 
-	/* callbacks */
-	ot->exec = rigidbody_objects_remove_exec;
-	ot->poll = ED_operator_scene_editable;
+  /* callbacks */
+  ot->exec = rigidbody_objects_remove_exec;
+  ot->poll = ED_operator_scene_editable;
 
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 }
 
 /* ********************************************** */
@@ -325,64 +333,68 @@ void RIGIDBODY_OT_objects_remove(wmOperatorType *ot)
 
 static int rigidbody_objects_shape_change_exec(bContext *C, wmOperator *op)
 {
-	int shape = RNA_enum_get(op->ptr, "type");
-	bool changed = false;
-
-	/* apply this to all selected objects... */
-	CTX_DATA_BEGIN(C, Object *, ob, selected_objects)
-	{
-		if (ob->rigidbody_object) {
-			PointerRNA ptr;
-
-			/* use RNA-system to change the property and perform all necessary changes */
-			RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
-			RNA_enum_set(&ptr, "collision_shape", shape);
-
-			DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
-
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-
-	if (changed) {
-		/* send updates */
-		WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
-		WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
-
-		/* done */
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+  int shape = RNA_enum_get(op->ptr, "type");
+  bool changed = false;
+
+  /* apply this to all selected objects... */
+  CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+    if (ob->rigidbody_object) {
+      PointerRNA ptr;
+
+      /* use RNA-system to change the property and perform all necessary changes */
+      RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
+      RNA_enum_set(&ptr, "collision_shape", shape);
+
+      DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
+
+      changed = true;
+    }
+  }
+  CTX_DATA_END;
+
+  if (changed) {
+    /* send updates */
+    WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
+    WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, NULL);
+
+    /* done */
+    return OPERATOR_FINISHED;
+  }
+  else {
+    return OPERATOR_CANCELLED;
+  }
 }
 
 void RIGIDBODY_OT_shape_change(wmOperatorType *ot)
 {
-	/* identifiers */
-	ot->idname = "RIGIDBODY_OT_shape_change";
-	ot->name = "Change Collision Shape";
-	ot->description = "Change collision shapes for selected Rigid Body Objects";
-
-	/* callbacks */
-	ot->invoke = WM_menu_invoke;
-	ot->exec = rigidbody_objects_shape_change_exec;
-	ot->poll = ED_operator_scene_editable;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
-
-	/* properties */
-	ot->prop = RNA_def_enum(ot->srna, "type", rna_enum_rigidbody_object_shape_items, RB_SHAPE_TRIMESH, "Rigid Body Shape", "");
+  /* identifiers */
+  ot->idname = "RIGIDBODY_OT_shape_change";
+  ot->name = "Change Collision Shape";
+  ot->description = "Change collision shapes for selected Rigid Body Objects";
+
+  /* callbacks */
+  ot->invoke = WM_menu_invoke;
+  ot->exec = rigidbody_objects_shape_change_exec;
+  ot->poll = ED_operator_scene_editable;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
+
+  /* properties */
+  ot->prop = RNA_def_enum(ot->srna,
+                          "type",
+                          rna_enum_rigidbody_object_shape_items,
+                          RB_SHAPE_TRIMESH,
+                          "Rigid Body Shape",
+                          "");
 }
 
 /* ************ Calculate Mass ************** */
 
 /* Entry in material density table */
 typedef struct rbMaterialDensityItem {
-	const char *name;   /* Name of material */
-	float density;      /* Density (kg/m^3) */
+  const char *name; /* Name of material */
+  float density;    /* Density (kg/m^3) */
 } rbMaterialDensityItem;
 
 /* Preset density values for materials (kg/m^3)
@@ -392,184 +404,194 @@ typedef struct rbMaterialDensityItem {
  * 3) http://www.avlandesign.com/density_metal.htm
  */
 static rbMaterialDensityItem RB_MATERIAL_DENSITY_TABLE[] = {
-	{N_("Air"), 1.0f}, /* not quite; adapted from 1.43 for oxygen for use as default */
-	{N_("Acrylic"), 1400.0f},
-	{N_("Asphalt (Crushed)"), 721.0f},
-	{N_("Bark"), 240.0f},
-	{N_("Beans (Cocoa)"), 593.0f},
-	{N_("Beans (Soy)"), 721.0f},
-	{N_("Brick (Pressed)"), 2400.0f},
-	{N_("Brick (Common)"), 2000.0f},
-	{N_("Brick (Soft)"), 1600.0f},
-	{N_("Brass"), 8216.0f},
-	{N_("Bronze"), 8860.0f},
-	{N_("Carbon (Solid)"), 2146.0f},
-	{N_("Cardboard"), 689.0f},
-	{N_("Cast Iron"), 7150.0f},
-	/* {N_("Cement"), 1442.0f}, */
-	{N_("Chalk (Solid)"), 2499.0f},
-	/* {N_("Coffee (Fresh/Roast)"), ~500}, */
-	{N_("Concrete"), 2320.0f},
-	{N_("Charcoal"), 208.0f},
-	{N_("Cork"), 240.0f},
-	{N_("Copper"), 8933.0f},
-	{N_("Garbage"), 481.0f},
-	{N_("Glass (Broken)"), 1940.0f},
-	{N_("Glass (Solid)"), 2190.0f},
-	{N_("Gold"), 19282.0f},
-	{N_("Granite (Broken)"), 1650.0f},
-	{N_("Granite (Solid)"), 2691.0f},
-	{N_("Gravel"), 2780.0f},
-	{N_("Ice (Crushed)"), 593.0f},
-	{N_("Ice (Solid)"), 919.0f},
-	{N_("Iron"), 7874.0f},
-	{N_("Lead"), 11342.0f},
-	{N_("Limestone (Broken)"), 1554.0f},
-	{N_("Limestone (Solid)"), 2611.0f},
-	{N_("Marble (Broken)"), 1570.0f},
-	{N_("Marble (Solid)"), 2563.0f},
-	{N_("Paper"), 1201.0f},
-	{N_("Peanuts (Shelled)"), 641.0f},
-	{N_("Peanuts (Not Shelled)"), 272.0f},
-	{N_("Plaster"), 849.0f},
-	{N_("Plastic"), 1200.0f},
-	{N_("Polystyrene"), 1050.0f},
-	{N_("Rubber"), 1522.0f},
-	{N_("Silver"), 10501.0f},
-	{N_("Steel"), 7860.0f},
-	{N_("Stone"), 2515.0f},
-	{N_("Stone (Crushed)"), 1602.0f},
-	{N_("Timber"), 610.0f},
+    {N_("Air"), 1.0f}, /* not quite; adapted from 1.43 for oxygen for use as default */
+    {N_("Acrylic"), 1400.0f},
+    {N_("Asphalt (Crushed)"), 721.0f},
+    {N_("Bark"), 240.0f},
+    {N_("Beans (Cocoa)"), 593.0f},
+    {N_("Beans (Soy)"), 721.0f},
+    {N_("Brick (Pressed)"), 2400.0f},
+    {N_("Brick (Common)"), 2000.0f},
+    {N_("Brick (Soft)"), 1600.0f},
+    {N_("Brass"), 8216.0f},
+    {N_("Bronze"), 8860.0f},
+    {N_("Carbon (Solid)"), 2146.0f},
+    {N_("Cardboard"), 689.0f},
+    {N_("Cast Iron"), 7150.0f},
+    /* {N_("Cement"), 1442.0f}, */
+    {N_("Chalk (Solid)"), 2499.0f},
+    /* {N_("Coffee (Fresh/Roast)"), ~500}, */
+    {N_("Concrete"), 2320.0f},
+    {N_("Charcoal"), 208.0f},
+    {N_("Cork"), 240.0f},
+    {N_("Copper"), 8933.0f},
+    {N_("Garbage"), 481.0f},
+    {N_("Glass (Broken)"), 1940.0f},
+    {N_("Glass (Solid)"), 2190.0f},
+    {N_("Gold"), 19282.0f},
+    {N_("Granite (Broken)"), 1650.0f},
+    {N_("Granite (Solid)"), 2691.0f},
+    {N_("Gravel"), 2780.0f},
+    {N_("Ice (Crushed)"), 593.0f},
+    {N_("Ice (Solid)"), 919.0f},
+    {N_("Iron"), 7874.0f},
+    {N_("Lead"), 11342.0f},
+    {N_("Limestone (Broken)"), 1554.0f},
+    {N_("Limestone (Solid)"), 2611.0f},
+    {N_("Marble (Broken)"), 1570.0f},
+    {N_("Marble (Solid)"), 2563.0f},
+    {N_("Paper"), 1201.0f},
+    {N_("Peanuts (Shelled)"), 641.0f},
+    {N_("Peanuts (Not Shelled)"), 272.0f},
+    {N_("Plaster"), 849.0f},
+    {N_("Plastic"), 1200.0f},
+    {N_("Polystyrene"), 1050.0f},
+    {N_("Rubber"), 1522.0f},
+    {N_("Silver"), 10501.0f},
+    {N_("Steel"), 7860.0f},
+    {N_("Stone"), 2515.0f},
+    {N_("Stone (Crushed)"), 1602.0f},
+    {N_("Timber"), 610.0f},
 };
-static const int NUM_RB_MATERIAL_PRESETS = sizeof(RB_MATERIAL_DENSITY_TABLE) / sizeof(rbMaterialDensityItem);
-
+static const int NUM_RB_MATERIAL_PRESETS = sizeof(RB_MATERIAL_DENSITY_TABLE) /
+                                           sizeof(rbMaterialDensityItem);
 
 /* dynamically generate list of items
  * - Although there is a runtime cost, this has a lower maintenance cost
  *   in the long run than other two-list solutions...
  */
-static const EnumPropertyItem *rigidbody_materials_itemf(bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free)
+static const EnumPropertyItem *rigidbody_materials_itemf(bContext *UNUSED(C),
+                                                         PointerRNA *UNUSED(ptr),
+                                                         PropertyRNA *UNUSED(prop),
+                                                         bool *r_free)
 {
-	EnumPropertyItem item_tmp = {0};
-	EnumPropertyItem *item = NULL;
-	int totitem = 0;
-	int i = 0;
-
-	/* add each preset to the list */
-	for (i = 0; i < NUM_RB_MATERIAL_PRESETS; i++) {
-		rbMaterialDensityItem *preset = &RB_MATERIAL_DENSITY_TABLE[i];
-
-		item_tmp.identifier = preset->name;
-		item_tmp.name = IFACE_(preset->name);
-		item_tmp.value = i;
-		RNA_enum_item_add(&item, &totitem, &item_tmp);
-	}
-
-	/* add special "custom" entry to the end of the list */
-	{
-		item_tmp.identifier = "Custom";
-		item_tmp.name = IFACE_("Custom");
-		item_tmp.value = -1;
-		RNA_enum_item_add(&item, &totitem, &item_tmp);
-	}
-
-	RNA_enum_item_end(&item, &totitem);
-	*r_free = true;
-
-	return item;
+  EnumPropertyItem item_tmp = {0};
+  EnumPropertyItem *item = NULL;
+  int totitem = 0;
+  int i = 0;
+
+  /* add each preset to the list */
+  for (i = 0; i < NUM_RB_MATERIAL_PRESETS; i++) {
+    rbMaterialDensityItem *preset = &RB_MATERIAL_DENSITY_TABLE[i];
+
+    item_tmp.identifier = preset->name;
+    item_tmp.name = IFACE_(preset->name);
+    item_tmp.value = i;
+    RNA_enum_item_add(&item, &totitem, &item_tmp);
+  }
+
+  /* add special "custom" entry to the end of the list */
+  {
+    item_tmp.identifier = "Custom";
+    item_tmp.name = IFACE_("Custom");
+    item_tmp.value = -1;
+    RNA_enum_item_add(&item, &totitem, &item_tmp);
+  }
+
+  RNA_enum_item_end(&item, &totitem);
+  *r_free = true;
+
+  return item;
 }
 
 /* ------------------------------------------ */
 
 static int rigidbody_objects_calc_mass_exec(bContext *C, wmOperator *op)
 {
-	Depsgraph *depsgraph = CTX_data_depsgraph(C);
-	int material = RNA_enum_get(op->ptr, "material");
-	float density;
-	bool changed = false;
-
-	/* get density (kg/m^3) to apply */
-	if (material >= 0) {
-		/* get density from table, and store in props for later repeating */
-		if (material >= NUM_RB_MATERIAL_PRESETS)
-			material = 0;
-
-		density = RB_MATERIAL_DENSITY_TABLE[material].density;
-		RNA_float_set(op->ptr, "density", density);
-	}
-	else {
-		/* custom - grab from whatever value is set */
-		density = RNA_float_get(op->ptr, "density");
-	}
-
-	/* apply this to all selected objects (with rigidbodies)... */
-	CTX_DATA_BEGIN(C, Object *, ob, selected_objects)
-	{
-		if (ob->rigidbody_object) {
-			PointerRNA ptr;
-
-			float volume; /* m^3 */
-			float mass;   /* kg */
-
-			/* mass is calculated from the approximate volume of the object,
-			 * and the density of the material we're simulating
-			 */
-			Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
-			BKE_rigidbody_calc_volume(ob_eval, &volume);
-			mass = volume * density;
-
-			/* use RNA-system to change the property and perform all necessary changes */
-			RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
-			RNA_float_set(&ptr, "mass", mass);
-
-			DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
-
-			changed = true;
-		}
-	}
-	CTX_DATA_END;
-
-	if (changed) {
-		/* send updates */
-		WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
-
-		/* done */
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
-	}
+  Depsgraph *depsgraph = CTX_data_depsgraph(C);
+  int material = RNA_enum_get(op->ptr, "material");
+  float density;
+  bool changed = false;
+
+  /* get density (kg/m^3) to apply */
+  if (material >= 0) {
+    /* get density from table, and store in props for later repeating */
+    if (material >= NUM_RB_MATERIAL_PRESETS)
+      material = 0;
+
+    density = RB_MATERIAL_DENSITY_TABLE[material].density;
+    RNA_float_set(op->ptr, "density", density);
+  }
+  else {
+    /* custom - grab from whatever value is set */
+    density = RNA_float_get(op->ptr, "density");
+  }
+
+  /* apply this to all selected objects (with rigidbodies)... */
+  CTX_DATA_BEGIN (C, Object *, ob, selected_objects) {
+    if (ob->rigidbody_object) {
+      PointerRNA ptr;
+
+      float volume; /* m^3 */
+      float mass;   /* kg */
+
+      /* mass is calculated from the approximate volume of the object,
+       * and the density of the material we're simulating
+       */
+      Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob);
+      BKE_rigidbody_calc_volume(ob_eval, &volume);
+      mass = volume * density;
+
+      /* use RNA-system to change the property and perform all necessary changes */
+      RNA_pointer_create(&ob->id, &RNA_RigidBodyObject, ob->rigidbody_object, &ptr);
+      RNA_float_set(&ptr, "mass", mass);
+
+      DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
+
+      changed = true;
+    }
+  }
+  CTX_DATA_END;
+
+  if (changed) {
+    /* send updates */
+    WM_event_add_notifier(C, NC_OBJECT | ND_POINTCACHE, NULL);
+
+    /* done */
+    return OPERATOR_FINISHED;
+  }
+  else {
+    return OPERATOR_CANCELLED;
+  }
 }
 
 void RIGIDBODY_OT_mass_calculate(wmOperatorType *ot)
 {
-	PropertyRNA *prop;
-
-	/* identifiers */
-	ot->idname = "RIGIDBODY_OT_mass_calculate";
-	ot->name = "Calculate Mass";
-	ot->description = "Automatically calculate mass values for Rigid Body Objects based on volume";
-
-	/* callbacks */
-	ot->invoke = WM_menu_invoke; // XXX
-	ot->exec = rigidbody_objects_calc_mass_exec;
-	ot->poll = ED_operator_scene_editable;
-
-	/* flags */
-	ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_USE_EVAL_DATA;
-
-	/* properties */
-	ot->prop = prop = RNA_def_enum(ot->srna, "material",
-	                               DummyRNA_DEFAULT_items, 0,
-	                               "Material Preset",
-	                               "Type of material that objects are made of (determines material density)");
-	RNA_def_enum_funcs(prop, rigidbody_materials_itemf);
-	RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
-
-	RNA_def_float(ot->srna, "density", 1.0, FLT_MIN, FLT_MAX,
-	              "Density",
-	              "Custom density value (kg/m^3) to use instead of material preset",
-	              1.0f, 2500.0f);
+  PropertyRNA *prop;
+
+  /* identifiers */
+  ot->idname = "RIGIDBODY_OT_mass_calculate";
+  ot->name = "Calculate Mass";
+  ot->description = "Automatically calculate mass values for Rigid Body Objects based on volume";
+
+  /* callbacks */
+  ot->invoke = WM_menu_invoke;  // XXX
+  ot->exec = rigidbody_objects_calc_mass_exec;
+  ot->poll = ED_operator_scene_editable;
+
+  /* flags */
+  ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_USE_EVAL_DATA;
+
+  /* properties */
+  ot->prop = prop = RNA_def_enum(
+      ot->srna,
+      "material",
+      DummyRNA_DEFAULT_items,
+      0,
+      "Material Preset",
+      "Type of material that objects are made of (determines material density)");
+  RNA_def_enum_funcs(prop, rigidbody_materials_itemf);
+  RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
+
+  RNA_def_float(ot->srna,
+                "density",
+                1.0,
+                FLT_MIN,
+                FLT_MAX,
+                "Density",
+                "Custom density value (kg/m^3) to use instead of material preset",
+                1.0f,
+                2500.0f);
 }
 
 /* ********************************************** */