diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/boids.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/editmesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/icons.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 7 |
8 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index c4db8ee925e..7a44553c565 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -501,7 +501,7 @@ enum { CD_FAKE = 1 << 8, /* Vertices. */ - CD_FAKE_MDEFORMVERT = CD_FAKE | CD_MDEFORMVERT, /* *sigh* due to how vgroups are stored :( . */ + CD_FAKE_MDEFORMVERT = CD_FAKE | CD_MDEFORMVERT, /* *sigh* due to how vgroups are stored :(. */ CD_FAKE_SHAPEKEY = CD_FAKE | CD_SHAPEKEY, /* Not available as real CD layer in non-bmesh context. */ diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index efd0fc71b20..9caf416cd0c 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -1072,7 +1072,7 @@ static BoidState *get_boid_state(BoidSettings *boids, ParticleData *pa) return state; } -#if 0 /* TODO */ +#if 0 /* TODO */ static int boid_condition_is_true(BoidCondition *cond) { return 0; diff --git a/source/blender/blenkernel/intern/editmesh.c b/source/blender/blenkernel/intern/editmesh.c index 9cae74e4e9a..83e03ef44f5 100644 --- a/source/blender/blenkernel/intern/editmesh.c +++ b/source/blender/blenkernel/intern/editmesh.c @@ -306,7 +306,7 @@ const float (*BKE_editmesh_vert_coords_when_deformed(struct Depsgraph *depsgraph } else if ((em->mesh_eval_final != NULL) && (em->mesh_eval_final->runtime.wrapper_type == ME_WRAPPER_TYPE_BMESH)) { - /* If this is an edit-mesh type, leave NULL as we can use the vertex coords. . */ + /* If this is an edit-mesh type, leave NULL as we can use the vertex coords. */ } else { /* Constructive modifiers have been used, we need to allocate coordinates. */ diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc index 7e9f81f9c83..12a0a1e3ae7 100644 --- a/source/blender/blenkernel/intern/icons.cc +++ b/source/blender/blenkernel/intern/icons.cc @@ -667,7 +667,7 @@ void BKE_previewimg_blend_read(BlendDataReader *reader, PreviewImage *prv) BKE_previewimg_finish(prv, i); } else { - /* Only for old files that didn't write the flag . */ + /* Only for old files that didn't write the flag. */ prv->flag[i] |= PRV_UNFINISHED; } } diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 730c989abc9..28282aaa823 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1237,7 +1237,7 @@ void BKE_layer_collection_isolate_global(Scene *scene, bool hide_it = extend && (lc->runtime_flag & LAYER_COLLECTION_VISIBLE_VIEW_LAYER); if (!extend) { - /* Hide all collections . */ + /* Hide all collections. */ LISTBASE_FOREACH (LayerCollection *, lc_iter, &lc_master->layer_collections) { layer_collection_flag_set_recursive(lc_iter, LAYER_COLLECTION_HIDE); } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 1af66fa090b..a1fa6aae1ce 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -880,7 +880,7 @@ static int palettecolor_compare_luminance(const void *a1, const void *a2) void BKE_palette_sort_hsv(tPaletteColorHSV *color_array, const int totcol) { - /* Sort by Hue , Saturation and Value. */ + /* Sort by Hue, Saturation and Value. */ qsort(color_array, totcol, sizeof(tPaletteColorHSV), palettecolor_compare_hsv); } diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index cff2c5cc562..a1b45c2ac7d 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -423,7 +423,7 @@ static void set_subsurf_legacy_uv(CCGSubSurf *ss, DerivedMesh *dm, DerivedMesh * /* get some info from CCGSubSurf */ totface = ccgSubSurf_getNumFaces(uvss); - /* edgeSize = ccgSubSurf_getEdgeSize(uvss); */ /*UNUSED*/ + // edgeSize = ccgSubSurf_getEdgeSize(uvss); /* UNUSED */ gridSize = ccgSubSurf_getGridSize(uvss); gridFaces = gridSize - 1; diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 560ae30967f..9b3103a638b 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1747,9 +1747,10 @@ void BKE_ffmpeg_preset_set(RenderData *rd, int preset) rd->ffcodecdata.type = FFMPEG_MPEG2; rd->ffcodecdata.video_bitrate = 6000; - /* Don't set resolution, see T21351. - * rd->xsch = 720; - * rd->ysch = isntsc ? 480 : 576; */ +# if 0 /* Don't set resolution, see T21351. */ + rd->xsch = 720; + rd->ysch = isntsc ? 480 : 576; +# endif rd->ffcodecdata.gop_size = isntsc ? 18 : 15; rd->ffcodecdata.rc_max_rate = 9000; |