diff options
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/split/kernel_data_init.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/file_draw.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_stereo.c | 4 |
8 files changed, 11 insertions, 12 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 94e53b71479..c3392d27b2c 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -1606,7 +1606,7 @@ protected: * mega kernel is not getting feature-based optimizations. * * Ideally we need always compile kernel with as less features - * enabed as possible to keep performance at it's max. + * enabled as possible to keep performance at it's max. */ return ""; } diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index acd2f5d0673..740a5f1f5d3 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1036,7 +1036,7 @@ enum QueueNumber { * contribution for AO are enqueued here. */ QUEUE_SHADOW_RAY_CAST_DL_RAYS = 3, /* All rays for which a shadow ray should be cast to determine radiance - * contributuin for direct lighting are enqueued here. + * contributing for direct lighting are enqueued here. */ }; diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h index 421e2356f9b..4dab79a5c67 100644 --- a/intern/cycles/kernel/split/kernel_data_init.h +++ b/intern/cycles/kernel/split/kernel_data_init.h @@ -31,7 +31,7 @@ * Un-initialized Ray --------------| |--- Initialized Ray * Un-initialized PathState --------| |--- Initialized PathState * Un-initialized QueueData --------| |--- Initialized QueueData (to QUEUE_EMPTY_SLOT) - * Un-initilaized QueueIndex -------| |--- Initialized QueueIndex (to 0) + * Un-initialized QueueIndex -------| |--- Initialized QueueIndex (to 0) * Un-initialized use_queues_flag---| |--- Initialized use_queues_flag (to false) * Un-initialized ray_state --------| |--- Initialized ray_state * parallel_samples --------------- | |--- Initialized per_sample_output_buffers @@ -383,7 +383,7 @@ ccl_device void kernel_data_init( &Ray_coop[ray_index]); if(Ray_coop[ray_index].t != 0.0f) { - /* Initialize throuput, L_transparent, Ray, PathState; + /* Initialize throughput, L_transparent, Ray, PathState; * These rays proceed with path-iteration. */ throughput_coop[ray_index] = make_float3(1.0f, 1.0f, 1.0f); diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index 641d30a5737..bf7e067616f 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -46,7 +46,7 @@ CCL_NAMESPACE_BEGIN #define NODE_FEATURE_HAIR (1 << 1) #define NODE_FEATURE_BUMP (1 << 2) /* TODO(sergey): Consider using something like ((uint)(-1)). - * Need to ceck carefully operand types around usage of this + * Need to check carefully operand types around usage of this * define first. */ #define NODE_FEATURE_ALL (NODE_FEATURE_VOLUME|NODE_FEATURE_HAIR|NODE_FEATURE_BUMP) diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h index 95ea91461f8..e2b42065382 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h @@ -250,7 +250,7 @@ struct CCGSubSurf { /* Limit evaluator, used to evaluate CCG. */ struct OpenSubdiv_EvaluatorDescr *osd_evaluator; - /* Next PTex face index, used while CCG synchroization + /* Next PTex face index, used while CCG synchronization * to fill in PTex index of CCGFace. */ int osd_next_face_ptex_index; diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 563f134a85a..2e07e19e366 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -480,7 +480,7 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) if (prop) { /* when creating new ID blocks, use is already 1, but RNA - * pointer se also increases user, so this compensates it */ + * pointer use also increases user, so this compensates it */ ma->id.us--; RNA_id_pointer_create(&ma->id, &idptr); diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 521572628a6..dac9124a4cb 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -655,11 +655,10 @@ void file_draw_list(const bContext *C, ARegion *ar) sx += (int)layout->column_widths[COLUMN_SIZE] + column_space; } else if (params->display == FILE_LONGDISPLAY) { - if (!(file->typeflag & FILE_TYPE_BLENDERLIB) && !FILENAME_IS_CURRPAR(file->relpath)) - { + if (!(file->typeflag & FILE_TYPE_BLENDERLIB) && !FILENAME_IS_CURRPAR(file->relpath)) { if ((file->entry->date_str[0] == '\0') || update_stat_strings) { BLI_filelist_entry_datetime_to_string( - NULL, file->entry->time, small_size, file->entry->time_str, file->entry->date_str); + NULL, file->entry->time, small_size, file->entry->time_str, file->entry->date_str); } file_draw_string( sx, sy, file->entry->date_str, layout->column_widths[COLUMN_DATE], layout->tile_h, align); diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index b3ddb2499dd..98c45bfb6ea 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -369,7 +369,7 @@ bool WM_stereo3d_enabled(wmWindow *win, bool skip_stereo3d_check) { bScreen *screen = win->screen; - /* some 3d methods change the window arrangment, thus they shouldn't + /* some 3d methods change the window arrangement, thus they shouldn't * toggle on/off just because there is no 3d elements being drawn */ if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) { return GHOST_GetWindowState(win->ghostwin) == GHOST_kWindowStateFullScreen; @@ -379,7 +379,7 @@ bool WM_stereo3d_enabled(wmWindow *win, bool skip_stereo3d_check) return false; } - /* some 3d methods change the window arrangment, thus they shouldn't + /* some 3d methods change the window arrangement, thus they shouldn't * toggle on/off just because there is no 3d elements being drawn */ if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) { return GHOST_GetWindowState(win->ghostwin) == GHOST_kWindowStateFullScreen; |