Differential D4407 Diff 14039 source/blender/modifiers/intern/MOD_ocean.c

Changeset View

Standalone View

Show First 20 Lines • Show All 144 Lines • ▼ Show 20 Lines	#else /* WITH_OCEANSIM */
/* unused */		/* unused */
(void)md;		(void)md;
(void)target;		(void)target;
(void)flag;		(void)flag;
#endif /* WITH_OCEANSIM */		#endif /* WITH_OCEANSIM */
}		}

#ifdef WITH_OCEANSIM		#ifdef WITH_OCEANSIM
static CustomDataMask requiredDataMask(Object UNUSED(ob), ModifierData md)		static void requiredDataMask(Object UNUSED(ob), ModifierData md, CustomData_MeshMasks *r_cddata_masks)
{		{
OceanModifierData omd = (OceanModifierData )md;		OceanModifierData omd = (OceanModifierData )md;
CustomDataMask dataMask = 0;

if (omd->flag & MOD_OCEAN_GENERATE_FOAM)		if (omd->flag & MOD_OCEAN_GENERATE_FOAM) {
dataMask \|= CD_MASK_MCOL;		r_cddata_masks->fmask \|= CD_MASK_MCOL; /* XXX Should be loop cddata I guess? */
		}
return dataMask;
}		}
#else /* WITH_OCEANSIM */		#else /* WITH_OCEANSIM */
static CustomDataMask requiredDataMask(Object UNUSED(ob), ModifierData md)		static void requiredDataMask(Object UNUSED(ob), ModifierData UNUSED(md), CustomData_MeshMasks *UNUSED(r_cddata_masks))
{		{
/* unused */
(void)md;
return 0;
}		}
#endif /* WITH_OCEANSIM */		#endif /* WITH_OCEANSIM */

static bool dependsOnNormals(ModifierData *md)		static bool dependsOnNormals(ModifierData *md)
{		{
OceanModifierData omd = (OceanModifierData )md;		OceanModifierData omd = (OceanModifierData )md;
return (omd->geometry_mode != MOD_OCEAN_GEOM_GENERATE);		return (omd->geometry_mode != MOD_OCEAN_GEOM_GENERATE);
}		}
▲ Show 20 Lines • Show All 356 Lines • Show Last 20 Lines