From 0ac990d088d553c27f5360f62e142e99f087890a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Apr 2019 00:18:34 +1000 Subject: Cleanup: comments (long lines) in editors --- source/blender/editors/physics/particle_edit.c | 7 ++++--- source/blender/editors/physics/particle_object.c | 6 ++++-- source/blender/editors/physics/physics_fluid.c | 20 ++++++++++++++------ 3 files changed, 22 insertions(+), 11 deletions(-) (limited to 'source/blender/editors/physics') diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 6f6f78fc321..68bbda51482 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -3256,8 +3256,8 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged) /* NOTE: this is not nice to use tessfaces but hard to avoid since pa->num uses tessfaces */ BKE_mesh_tessface_ensure(me); - /* Note: In case psys uses Mesh tessface indices, we mirror final Mesh itself, not orig mesh. Avoids an (impossible) - * mesh -> orig -> mesh tessface indices conversion... */ + /* NOTE: In case psys uses Mesh tessface indices, we mirror final Mesh itself, not orig mesh. + * Avoids an (impossible) mesh -> orig -> mesh tessface indices conversion. */ mirrorfaces = mesh_get_x_mirror_faces( ob, NULL, use_dm_final_indices ? psmd_eval->mesh_final : NULL); @@ -3350,7 +3350,8 @@ static void PE_mirror_x(Scene *scene, Object *ob, int tagged) } /* assign face index */ - /* NOTE: mesh_get_x_mirror_faces generates -1 for non-found mirror, same as DMCACHE_NOTFOUND... */ + /* NOTE: mesh_get_x_mirror_faces generates -1 for non-found mirror, + * same as DMCACHE_NOTFOUND. */ newpa->num = mirrorfaces[pa_num * 2]; if (use_dm_final_indices) { diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 4320760cf96..214a9f22186 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -1066,8 +1066,10 @@ static bool copy_particle_systems_to_object(const bContext *C, * the final DM of the object without particles. * However, when evaluating the DM all the particle modifiers must be valid, * i.e. have the psys assigned already. - * To break this hen/egg problem we create all psys separately first (to collect required customdata masks), - * then create the DM, then add them to the object and make the psys modifiers ... + * + * To break this hen/egg problem we create all psys separately first + * (to collect required customdata masks), + * then create the DM, then add them to the object and make the psys modifiers. */ #define PSYS_FROM_FIRST (single_psys_from ? single_psys_from : ob_from->particlesystem.first) #define PSYS_FROM_NEXT(cur) (single_psys_from ? NULL : (cur)->next) diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 65fb58efe6d..d90fefaa67f 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -701,7 +701,8 @@ static bool fluid_init_filepaths(Main *bmain, const bool dir_exists = BLI_dir_create_recursive(targetDir); const bool is_writable = BLI_file_is_writable(targetFile); - /* We change path to some presumably valid default value, but do not allow bake process to continue, + /* We change path to some presumably valid default value, + * but do not allow bake process to continue, * this gives user chance to set manually another path. */ if (!dir_exists || !is_writable) { modifier_path_init(domainSettings->surfdataPath, @@ -817,7 +818,13 @@ static int runSimulationCallback(void *data, int status, int frame) if (status == FLUIDSIM_CBSTATUS_NEWFRAME) { fluidbake_updatejob(fb, frame / (float)settings->noOfFrames); - //printf("elbeem blender cb s%d, f%d, domainid:%d noOfFrames: %d\n", status, frame, settings->domainId, settings->noOfFrames ); // DEBUG +# if 0 + printf("elbeem blender cb s%d, f%d, domainid:%d noOfFrames: %d\n", + status, + frame, + settings->domainId, + settings->noOfFrames); // DEBUG +# endif } if (fluidbake_breakjob(fb)) { @@ -940,7 +947,8 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor elbeemDebugOut(debugStrBuffer); } - /* make sure it corresponds to startFrame setting (old: noFrames = scene->r.efra - scene->r.sfra +1) */ + /* Make sure it corresponds to startFrame setting + * (old: noFrames = scene->r.efra - scene->r.sfra +1). */ ; noFrames = scene->r.efra - 0; if (noFrames <= 0) { @@ -1017,9 +1025,9 @@ static int fluidsimBake(bContext *C, ReportList *reports, Object *fsDomain, shor return false; } - channels->length = - scene->r - .efra; // DG TODO: why using endframe and not "noFrames" here? .. because "noFrames" is buggy too? (not using sfra) + /* DG TODO: why using endframe and not "noFrames" here? + * because "noFrames" is buggy too? (not using sfra) */ + channels->length = scene->r.efra; channels->aniFrameTime = (double)((double)domainSettings->animEnd - (double)domainSettings->animStart) / (double)noFrames; -- cgit v1.2.3