Differential D11057 Diff 36451 source/blender/blenkernel/intern/object_update.c

Changeset View

Standalone View

source/blender/blenkernel/intern/object_update.c

	Show First 20 Lines • Show All 170 Lines • ▼ Show 20 Lines
	#if 0			#if 0
	BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? BKE_editmesh_from_object(ob) : NULL;			BMEditMesh *em = (ob->mode & OB_MODE_EDIT) ? BKE_editmesh_from_object(ob) : NULL;
	#else			#else
	BMEditMesh em = (ob->mode & OB_MODE_EDIT) ? ((Mesh )ob->data)->edit_mesh : NULL;			BMEditMesh em = (ob->mode & OB_MODE_EDIT) ? ((Mesh )ob->data)->edit_mesh : NULL;
	#endif			#endif

	CustomData_MeshMasks cddata_masks = scene->customdata_mask;			CustomData_MeshMasks cddata_masks = scene->customdata_mask;
	CustomData_MeshMasks_update(&cddata_masks, &CD_MASK_BAREMESH);			CustomData_MeshMasks_update(&cddata_masks, &CD_MASK_BAREMESH);
				/* Custom attributes should not be removed automatically. They might be used by the render
				* engine or scripts. They can still be removed explicitly using geometry nodes. */
				cddata_masks.vmask \|= CD_MASK_PROP_ALL;
				cddata_masks.emask \|= CD_MASK_PROP_ALL;
				cddata_masks.fmask \|= CD_MASK_PROP_ALL;
				cddata_masks.pmask \|= CD_MASK_PROP_ALL;
				cddata_masks.lmask \|= CD_MASK_PROP_ALL;
	/* Make sure Freestyle edge/face marks appear in DM for render (see T40315).			/* Make sure Freestyle edge/face marks appear in DM for render (see T40315).
	* Due to Line Art implementation, edge marks should also be shown in viewport. */			* Due to Line Art implementation, edge marks should also be shown in viewport. */
	#ifdef WITH_FREESTYLE			#ifdef WITH_FREESTYLE
	cddata_masks.emask \|= CD_MASK_FREESTYLE_EDGE;			cddata_masks.emask \|= CD_MASK_FREESTYLE_EDGE;
	cddata_masks.pmask \|= CD_MASK_FREESTYLE_FACE;			cddata_masks.pmask \|= CD_MASK_FREESTYLE_FACE;
	cddata_masks.vmask \|= CD_MASK_MDEFORMVERT;			cddata_masks.vmask \|= CD_MASK_MDEFORMVERT;
	#endif			#endif
	if (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER) {			if (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER) {
	▲ Show 20 Lines • Show All 308 Lines • Show Last 20 Lines