diff options
-rw-r--r-- | intern/cycles/kernel/kernel_camera.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/smoke.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_polygon_edgenet.c | 4 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_app.c | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h index c51174b645d..033c3fc7785 100644 --- a/intern/cycles/kernel/kernel_camera.h +++ b/intern/cycles/kernel/kernel_camera.h @@ -302,7 +302,7 @@ ccl_device void camera_sample(KernelGlobals *kg, int x, int y, float filter_u, f /* TODO(sergey): Currently single rolling shutter effect type only * where scanlines are acquired from top to bottom and whole scanline * is acquired at once (no delay in acquisition happens between pixels - * of sinle scanline). + * of single scanline). * * Might want to support more models in the future. */ diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 62874939a6d..b2aaf821df8 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -126,7 +126,7 @@ void smoke_initWaveletBlenderRNA(struct WTURBULENCE *UNUSED(wt), float *UNUSED(s void smoke_initBlenderRNA(struct FLUID_3D *UNUSED(fluid), float *UNUSED(alpha), float *UNUSED(beta), float *UNUSED(dt_factor), float *UNUSED(vorticity), int *UNUSED(border_colli), float *UNUSED(burning_rate), float *UNUSED(flame_smoke), float *UNUSED(flame_smoke_color), float *UNUSED(flame_vorticity), float *UNUSED(flame_ignition_temp), float *UNUSED(flame_max_temp)) {} -struct DerivedMesh *smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm), bool UNUSED(for_render)) { return NULL; } +struct DerivedMesh *smokeModifier_do(SmokeModifierData *UNUSED(smd), Scene *UNUSED(scene), Object *UNUSED(ob), DerivedMesh *UNUSED(dm)) { return NULL; } float smoke_get_velocity_at(struct Object *UNUSED(ob), float UNUSED(position[3]), float UNUSED(velocity[3])) { return 0.0f; } #endif /* WITH_SMOKE */ diff --git a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c index d2209f46877..bd7bdc74c1e 100644 --- a/source/blender/bmesh/intern/bmesh_polygon_edgenet.c +++ b/source/blender/bmesh/intern/bmesh_polygon_edgenet.c @@ -690,7 +690,7 @@ static void bvhtree_test_edges_isect_2d_vert_cb( const float t = line_point_factor_v2(co_isect, data->v_origin->co, data->v_other->co); const float dist_new = data->dist_orig * t; /* avoid float precision issues, possible this is greater, - * check anove zero to allow some overlap + * check above zero to allow some overlap * (and needed for partial-connect which will overlap vertices) */ if (LIKELY((dist_new < hit->dist) && (dist_new > 0.0f))) { /* v1/v2 will both be in the same group */ @@ -714,7 +714,7 @@ static void bvhtree_test_edges_isect_2d_ray_cb( float dist_new; if (isect_ray_seg_v2(data->v_origin->co, ray->direction, e->v1->co, e->v2->co, &dist_new, NULL)) { /* avoid float precision issues, possible this is greater, - * check anove zero to allow some overlap + * check above zero to allow some overlap * (and needed for partial-connect which will overlap vertices) */ if (LIKELY(dist_new < hit->dist && (dist_new > 0.0f))) { if (e->v1 != data->v_origin && e->v2 != data->v_origin) { diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 3f1e06f9065..1b0a52313ec 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -854,7 +854,7 @@ void gp_stroke_delete_tagged_points(bGPDframe *gpf, bGPDstroke *gps, bGPDstroke * timings of these new strokes: * * Each point's timing data is a delta from stroke's inittime, so as we erase some points from - * the start of the stroke, we have to offset this inittime and all remaing points' delta values. + * the start of the stroke, we have to offset this inittime and all remaining points' delta values. * This way we get a new stroke with exactly the same timing as if user had started drawing from * the first non-removed point... */ diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 6425475a2c6..cfa7622c444 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -212,7 +212,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) do_init = (v2d->flag & V2D_IS_INITIALISED) == 0; - /* initialize without scroll bars (interfears with zoom level see: T47047) */ + /* initialize without scroll bars (interferes with zoom level see: T47047) */ if (do_init) { v2d->scroll |= V2D_SCROLL_VERTICAL_FULLR | V2D_SCROLL_HORIZONTAL_FULLR; } diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c index 90d97cad880..8ce2ae899d8 100644 --- a/source/blender/python/intern/bpy_app.c +++ b/source/blender/python/intern/bpy_app.c @@ -334,8 +334,8 @@ static PyGetSetDef bpy_app_getsets[] = { {(char *)"tempdir", bpy_app_tempdir_get, NULL, (char *)bpy_app_tempdir_doc, NULL}, {(char *)"driver_namespace", bpy_app_driver_dict_get, NULL, (char *)bpy_app_driver_dict_doc, NULL}, - {(char *)"render_icon_size", bpy_app_preview_render_size_get, NULL, (char *)bpy_app_preview_render_size_doc, (void *)ICON_SIZE_ICON}, - {(char *)"render_preview_size", bpy_app_preview_render_size_get, NULL, (char *)bpy_app_preview_render_size_doc, (void *)ICON_SIZE_PREVIEW}, + {(char *)"render_icon_size", bpy_app_preview_render_size_get, NULL, (char *)bpy_app_preview_render_size_doc, (void *)ICON_SIZE_ICON}, + {(char *)"render_preview_size", bpy_app_preview_render_size_get, NULL, (char *)bpy_app_preview_render_size_doc, (void *)ICON_SIZE_PREVIEW}, /* security */ {(char *)"autoexec_fail", bpy_app_global_flag_get, NULL, NULL, (void *)G_SCRIPT_AUTOEXEC_FAIL}, |