Differential D9867 Diff 32049 source/blender/editors/object/object_add.c

Changeset View

Standalone View

source/blender/editors/object/object_add.c

	Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
	* \{ */			* \{ */

	static const EnumPropertyItem convert_target_items[] = {			static const EnumPropertyItem convert_target_items[] = {
	{OB_CURVE, "CURVE", ICON_OUTLINER_OB_CURVE, "Curve", "Curve from Mesh or Text objects"},			{OB_CURVE, "CURVE", ICON_OUTLINER_OB_CURVE, "Curve", "Curve from Mesh or Text objects"},
	{OB_MESH,			{OB_MESH,
	"MESH",			"MESH",
	ICON_OUTLINER_OB_MESH,			ICON_OUTLINER_OB_MESH,
	"Mesh",			"Mesh",
	"Mesh from Curve, Surface, Metaball, Text, or Pointcloud objects"},			"Mesh from Curve, Surface, Metaball, Text, or Point Cloud objects"},
	{OB_GPENCIL,			{OB_GPENCIL,
	"GPENCIL",			"GPENCIL",
	ICON_OUTLINER_OB_GREASEPENCIL,			ICON_OUTLINER_OB_GREASEPENCIL,
	"Grease Pencil",			"Grease Pencil",
	"Grease Pencil from Curve or Mesh objects"},			"Grease Pencil from Curve or Mesh objects"},
	{OB_POINTCLOUD,			{OB_POINTCLOUD,
	"POINTCLOUD",			"POINTCLOUD",
	ICON_OUTLINER_OB_POINTCLOUD,			ICON_OUTLINER_OB_POINTCLOUD,
	"Pointcloud",			"Point Cloud",
	"Pointcloud from Mesh objects"},			"Point Cloud from Mesh objects"},
	{0, NULL, 0, NULL, NULL},			{0, NULL, 0, NULL, NULL},
	};			};

	static void object_data_convert_ensure_curve_cache(Depsgraph depsgraph, Scene scene, Object *ob)			static void object_data_convert_ensure_curve_cache(Depsgraph depsgraph, Scene scene, Object *ob)
	{			{
	if (ob->runtime.curve_cache == NULL) {			if (ob->runtime.curve_cache == NULL) {
	/* Force creation. This is normally not needed but on operator			/* Force creation. This is normally not needed but on operator
	* redo we might end up with an object which isn't evaluated yet.			* redo we might end up with an object which isn't evaluated yet.
	▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines