Differential D14561 Diff 50673 source/blender/blenkernel/intern/displist.cc

Changeset View

Standalone View

source/blender/blenkernel/intern/displist.cc

	Show First 20 Lines • Show All 992 Lines • ▼ Show 20 Lines
	}			}

	void BKE_displist_make_curveTypes(Depsgraph *depsgraph,			void BKE_displist_make_curveTypes(Depsgraph *depsgraph,
	const Scene *scene,			const Scene *scene,
	Object *ob,			Object *ob,
	const bool for_render)			const bool for_render)
	{			{
	BLI_assert(ELEM(ob->type, OB_SURF, OB_CURVES_LEGACY, OB_FONT));			BLI_assert(ELEM(ob->type, OB_SURF, OB_CURVES_LEGACY, OB_FONT));
	Curve &cow_curve = (Curve )ob->data;

	BKE_object_free_derived_caches(ob);			BKE_object_free_derived_caches(ob);
	cow_curve.curve_eval = nullptr;
				/* It's important to retrieve this after calling #BKE_object_free_derived_caches,
				* which may reset the object data pointer in some cases. */
				const Curve &original_curve = static_cast<const Curve >(ob->data);

				sergeyUnsubmitted Not Done Inline Actions I'd call it `input_curve` (input as in input of the modifier stack), to not be confused with original curve which is owned by bmain. sergey: I'd call it `input_curve` (input as in input of the modifier stack), to not be confused with…
	ob->runtime.curve_cache = MEM_cnew<CurveCache>(__func__);			ob->runtime.curve_cache = MEM_cnew<CurveCache>(__func__);
	ListBase *dispbase = &ob->runtime.curve_cache->disp;			ListBase *dispbase = &ob->runtime.curve_cache->disp;

	if (ob->type == OB_SURF) {			if (ob->type == OB_SURF) {
	GeometrySet geometry = evaluate_surface_object(depsgraph, scene, ob, for_render, dispbase);			GeometrySet geometry = evaluate_surface_object(depsgraph, scene, ob, for_render, dispbase);
	ob->runtime.geometry_set_eval = new GeometrySet(std::move(geometry));			ob->runtime.geometry_set_eval = new GeometrySet(std::move(geometry));
	}			}
	else {			else {
	GeometrySet geometry = evaluate_curve_type_object(depsgraph, scene, ob, for_render, dispbase);			GeometrySet geometry = evaluate_curve_type_object(depsgraph, scene, ob, for_render, dispbase);

	if (geometry.has_curves()) {			if (geometry.has_curves()) {
	/* Assign the evaluated curve to the object's "data_eval". In addition to the curve_eval			/* Create a copy of the original curve and add necessary pointers to evaluated and edit mode
	* added to the curve here, it will also contain a copy of the original curve's data. This is			* data. This is needed for a few reasons:
	* essential, because it maintains the expected behavior for evaluated curve data from before			* - Existing code from before curve evaluation was changed to use #GeometrySet expected to
	* the CurveEval data type was introduced, when an evaluated object's curve data was just a			* have a copy of the original curve data. (Any evaluated data was placed in
	* copy of the original curve and everything else ended up in #CurveCache. */			* #Object.runtime.curve_cache).
	CurveComponent &curve_component = geometry.get_component_for_write<CurveComponent>();			* - The result of modifier evaluation is not a #Curve data-block but a #Curves data-block,
	cow_curve.curve_eval = curve_component.get_for_read();			* which can support constructive modifiers and geometry nodes.
				JacquesLuckeUnsubmitted Done Inline Actions This comment should be updated, it still mentions `CurveEval`. JacquesLucke: This comment should be updated, it still mentions `CurveEval`.
	BKE_object_eval_assign_data(ob, &cow_curve.id, false);			* - The dependency graph has handling of edit mode pointers (see #update_edit_mode_pointers)
				* but it doesn't seem to work in this case.
				*
				* Since the the plan is to replace this legacy curve object with the curves data-block
				* (see T95355), this somewhat hacky inefficient solution is relatively temporary.
				*/
				Curve &cow_curve = reinterpret_cast<Curve >(
				BKE_id_copy_ex(nullptr, &original_curve.id, nullptr, LIB_ID_COPY_LOCALIZE));
				cow_curve.curve_eval = geometry.get_curves_for_read();
				/* Copy edit mode pointers necessary for drawing to the duplicated curve. */
				cow_curve.editnurb = original_curve.editnurb;
				cow_curve.editfont = original_curve.editfont;
				cow_curve.edit_data_from_original = true;
				BKE_object_eval_assign_data(ob, &cow_curve.id, true);
	}			}

	ob->runtime.geometry_set_eval = new GeometrySet(std::move(geometry));			ob->runtime.geometry_set_eval = new GeometrySet(std::move(geometry));
	}			}

	BKE_object_boundbox_calc_from_evaluated_geometry(ob);			BKE_object_boundbox_calc_from_evaluated_geometry(ob);
	}			}

	Show All 20 Lines