Differential D14114 Diff 48447 source/blender/makesrna/intern/rna_object_force.c

Changeset View

Standalone View

source/blender/makesrna/intern/rna_object_force.c

	Show First 20 Lines • Show All 92 Lines • ▼ Show 20 Lines
	ID_RECALC_TRANSFORM \| ID_RECALC_GEOMETRY \| ID_RECALC_ANIMATION \|			ID_RECALC_TRANSFORM \| ID_RECALC_GEOMETRY \| ID_RECALC_ANIMATION \|
	ID_RECALC_PSYS_RESET);			ID_RECALC_PSYS_RESET);
	}			}
	else {			else {
	Object ob = (Object )ptr->owner_id;			Object ob = (Object )ptr->owner_id;

	rna_FieldSettings_shape_update(bmain, scene, ptr);			rna_FieldSettings_shape_update(bmain, scene, ptr);

	if (ob->type == OB_CURVE && ob->pd->forcefield == PFIELD_GUIDE) {			if (ob->type == OB_CURVES_LEGACY && ob->pd->forcefield == PFIELD_GUIDE) {
	DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM \| ID_RECALC_GEOMETRY \| ID_RECALC_ANIMATION);			DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM \| ID_RECALC_GEOMETRY \| ID_RECALC_ANIMATION);
	}			}
	else {			else {
	DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);			DEG_id_tag_update(&ob->id, ID_RECALC_TRANSFORM);
	}			}

	WM_main_add_notifier(NC_OBJECT \| ND_DRAW, ob);			WM_main_add_notifier(NC_OBJECT \| ND_DRAW, ob);
	}			}
	▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Lines
	Object *ob = NULL;			Object *ob = NULL;

	if (particle_id_check(ptr)) {			if (particle_id_check(ptr)) {
	return empty_shape_items;			return empty_shape_items;
	}			}

	ob = (Object *)ptr->owner_id;			ob = (Object *)ptr->owner_id;

	if (ob->type == OB_CURVE) {			if (ob->type == OB_CURVES_LEGACY) {
	if (ob->pd->forcefield == PFIELD_VORTEX) {			if (ob->pd->forcefield == PFIELD_VORTEX) {
	return curve_vortex_shape_items;			return curve_vortex_shape_items;
	}			}

	return curve_shape_items;			return curve_shape_items;
	}			}
	else if (ELEM(ob->type, OB_MESH, OB_SURF, OB_FONT)) {			else if (ELEM(ob->type, OB_MESH, OB_SURF, OB_FONT)) {
	if (ob->pd->forcefield == PFIELD_VORTEX) {			if (ob->pd->forcefield == PFIELD_VORTEX) {
	▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines