Cleanup: indentation
This commit is contained in:
parent
95eb9f22e6
commit
eb6fe5fa94
Notes:
blender-bot
2023-02-14 08:10:06 +01:00
Referenced by issue #55219, Symmetrize and Mirror Modifier change the Normals on a Mesh Referenced by issue #54703, Alembic Export of Metaball Particle System
|
@ -252,8 +252,9 @@ void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm,
|
|||
path = cache[p];
|
||||
|
||||
if (part->from == PART_FROM_FACE &&
|
||||
part->childtype != PART_CHILD_PARTICLES &&
|
||||
mtface) {
|
||||
part->childtype != PART_CHILD_PARTICLES &&
|
||||
mtface)
|
||||
{
|
||||
const int num = pc->num;
|
||||
if (num < 0) {
|
||||
ABC_LOG(m_settings.logger)
|
||||
|
|
|
@ -290,7 +290,8 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
|
|||
|
||||
/* The archive's top object can be recognised by not having a parent. */
|
||||
if (abc_parent.getParent()
|
||||
&& IXform::matches(abc_parent.getMetaData())) {
|
||||
&& IXform::matches(abc_parent.getMetaData()))
|
||||
{
|
||||
return IXform(abc_parent, Alembic::AbcGeom::kWrapExisting);
|
||||
}
|
||||
|
||||
|
|
|
@ -456,7 +456,8 @@ void clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, Derived
|
|||
cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, can_simulate);
|
||||
|
||||
if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED ||
|
||||
(!can_simulate && cache_result == PTCACHE_READ_OLD)) {
|
||||
(!can_simulate && cache_result == PTCACHE_READ_OLD))
|
||||
{
|
||||
BKE_cloth_solver_set_positions(clmd);
|
||||
cloth_to_object (ob, clmd, vertexCos);
|
||||
|
||||
|
|
|
@ -240,10 +240,12 @@ static void distribute_grid(DerivedMesh *dm, ParticleSystem *psys)
|
|||
if (mface->v4 && (!intersects_tri || from==PART_FROM_VOLUME)) {
|
||||
copy_v3_v3(v4, mvert[mface->v4].co);
|
||||
|
||||
if (isect_ray_tri_watertight_v3(co1,
|
||||
&isect_precalc,
|
||||
v1, v3, v4,
|
||||
&lambda, NULL)) {
|
||||
if (isect_ray_tri_watertight_v3(
|
||||
co1,
|
||||
&isect_precalc,
|
||||
v1, v3, v4,
|
||||
&lambda, NULL))
|
||||
{
|
||||
if (from==PART_FROM_FACE)
|
||||
(pa+(int)(lambda*size[a])*a0mul)->flag &= ~PARS_UNEXIST;
|
||||
else
|
||||
|
|
|
@ -3722,7 +3722,8 @@ void sbObjectStep(Scene *scene, Object *ob, float cfra, float (*vertexCos)[3], i
|
|||
cache_result = BKE_ptcache_read(&pid, (float)framenr+scene->r.subframe, can_simulate);
|
||||
|
||||
if (cache_result == PTCACHE_READ_EXACT || cache_result == PTCACHE_READ_INTERPOLATED ||
|
||||
(!can_simulate && cache_result == PTCACHE_READ_OLD)) {
|
||||
(!can_simulate && cache_result == PTCACHE_READ_OLD))
|
||||
{
|
||||
softbody_to_object(ob, vertexCos, numVerts, sb->local);
|
||||
|
||||
BKE_ptcache_validate(cache, framenr);
|
||||
|
|
|
@ -1753,7 +1753,8 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float
|
|||
if (type != COLLADAFW::Transformation::ROTATE &&
|
||||
type != COLLADAFW::Transformation::SCALE &&
|
||||
type != COLLADAFW::Transformation::TRANSLATE &&
|
||||
type != COLLADAFW::Transformation::MATRIX) {
|
||||
type != COLLADAFW::Transformation::MATRIX)
|
||||
{
|
||||
fprintf(stderr, "animation of transformation %d is not supported yet\n", type);
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -149,12 +149,13 @@ void EffectsExporter::writePhong(COLLADASW::EffectProfile &ep, Material *ma)
|
|||
ep.setSpecular(cot, false, "specular");
|
||||
}
|
||||
|
||||
void EffectsExporter::writeTextures(COLLADASW::EffectProfile &ep,
|
||||
std::string &key,
|
||||
COLLADASW::Sampler *sampler,
|
||||
MTex *t, Image *ima,
|
||||
std::string &uvname ) {
|
||||
|
||||
void EffectsExporter::writeTextures(
|
||||
COLLADASW::EffectProfile &ep,
|
||||
std::string &key,
|
||||
COLLADASW::Sampler *sampler,
|
||||
MTex *t, Image *ima,
|
||||
std::string &uvname )
|
||||
{
|
||||
// Image not set for texture
|
||||
if (!ima) return;
|
||||
|
||||
|
|
|
@ -1093,7 +1093,8 @@ MTFace *MeshImporter::assign_material_to_geom(COLLADAFW::MaterialBinding cmateri
|
|||
// set texture face
|
||||
if (color_texture &&
|
||||
strlen((color_texture)->uvname) &&
|
||||
!STREQ(layername, color_texture->uvname)) {
|
||||
!STREQ(layername, color_texture->uvname))
|
||||
{
|
||||
texture_face = (MTFace *)CustomData_get_layer_named(&me->fdata, CD_MTFACE,
|
||||
color_texture->uvname);
|
||||
strcpy(layername, color_texture->uvname);
|
||||
|
|
|
@ -705,8 +705,8 @@ static bool remap_hair_emitter(Scene *scene, Object *ob, ParticleSystem *psys,
|
|||
|
||||
for (i = 0, tpa = target_psys->particles, pa = psys->particles;
|
||||
i < target_psys->totpart;
|
||||
i++, tpa++, pa++) {
|
||||
|
||||
i++, tpa++, pa++)
|
||||
{
|
||||
float from_co[3];
|
||||
BVHTreeNearest nearest;
|
||||
|
||||
|
@ -1004,8 +1004,8 @@ static bool copy_particle_systems_to_object(Main *bmain,
|
|||
cdmask = 0;
|
||||
for (psys_from = PSYS_FROM_FIRST, i = 0;
|
||||
psys_from;
|
||||
psys_from = PSYS_FROM_NEXT(psys_from), ++i) {
|
||||
|
||||
psys_from = PSYS_FROM_NEXT(psys_from), ++i)
|
||||
{
|
||||
psys = BKE_object_copy_particlesystem(psys_from, 0);
|
||||
tmp_psys[i] = psys;
|
||||
|
||||
|
@ -1025,8 +1025,8 @@ static bool copy_particle_systems_to_object(Main *bmain,
|
|||
/* now append psys to the object and make modifiers */
|
||||
for (i = 0, psys_from = PSYS_FROM_FIRST;
|
||||
i < totpsys;
|
||||
++i, psys_from = PSYS_FROM_NEXT(psys_from)) {
|
||||
|
||||
++i, psys_from = PSYS_FROM_NEXT(psys_from))
|
||||
{
|
||||
ParticleSystemModifierData *psmd;
|
||||
|
||||
psys = tmp_psys[i];
|
||||
|
@ -1063,8 +1063,8 @@ static bool copy_particle_systems_to_object(Main *bmain,
|
|||
*/
|
||||
for (psys = psys_start, psys_from = PSYS_FROM_FIRST, i = 0;
|
||||
psys;
|
||||
psys = psys->next, psys_from = PSYS_FROM_NEXT(psys_from), ++i) {
|
||||
|
||||
psys = psys->next, psys_from = PSYS_FROM_NEXT(psys_from), ++i)
|
||||
{
|
||||
float (*from_mat)[4], (*to_mat)[4];
|
||||
|
||||
switch (space) {
|
||||
|
|
Loading…
Reference in New Issue