sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: spelling/style

Browse Source
This commit is contained in:
Campbell Barton 2015-08-23 21:12:48 +10:00
parent 83e16a4a87
commit 2672ee77a0
8 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/device_opencl.cpp
View File

@ -1606,7 +1606,7 @@ protected:
* mega kernel is not getting feature-based optimizations. * mega kernel is not getting feature-based optimizations.
* *
* Ideally we need always compile kernel with as less features * 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 ""; return "";
} }

2
intern/cycles/kernel/kernel_types.h
View File

@ -1036,7 +1036,7 @@ enum QueueNumber {
* contribution for AO are enqueued here. * 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 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.
*/ */
}; };

4
intern/cycles/kernel/split/kernel_data_init.h
View File

@ -31,7 +31,7 @@
* Un-initialized Ray --------------| |--- Initialized Ray * Un-initialized Ray --------------| |--- Initialized Ray
* Un-initialized PathState --------| |--- Initialized PathState * Un-initialized PathState --------| |--- Initialized PathState
* Un-initialized QueueData --------| |--- Initialized QueueData (to QUEUE_EMPTY_SLOT) * 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 use_queues_flag---| |--- Initialized use_queues_flag (to false)
* Un-initialized ray_state --------| |--- Initialized ray_state * Un-initialized ray_state --------| |--- Initialized ray_state
* parallel_samples --------------- | |--- Initialized per_sample_output_buffers * parallel_samples --------------- | |--- Initialized per_sample_output_buffers
@ -383,7 +383,7 @@ ccl_device void kernel_data_init(
&Ray_coop[ray_index]); &Ray_coop[ray_index]);
if(Ray_coop[ray_index].t != 0.0f) { 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. * These rays proceed with path-iteration.
*/ */
throughput_coop[ray_index] = make_float3(1.0f, 1.0f, 1.0f); throughput_coop[ray_index] = make_float3(1.0f, 1.0f, 1.0f);

2
intern/cycles/kernel/svm/svm_types.h
View File

@ -46,7 +46,7 @@ CCL_NAMESPACE_BEGIN
#define NODE_FEATURE_HAIR (1 << 1) #define NODE_FEATURE_HAIR (1 << 1)
#define NODE_FEATURE_BUMP (1 << 2) #define NODE_FEATURE_BUMP (1 << 2)
/* TODO(sergey): Consider using something like ((uint)(-1)). /* 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 first.
*/ */
#define NODE_FEATURE_ALL (NODE_FEATURE_VOLUME|NODE_FEATURE_HAIR|NODE_FEATURE_BUMP) #define NODE_FEATURE_ALL (NODE_FEATURE_VOLUME|NODE_FEATURE_HAIR|NODE_FEATURE_BUMP)

2
source/blender/blenkernel/intern/CCGSubSurf_intern.h
View File

@ -250,7 +250,7 @@ struct CCGSubSurf {
/* Limit evaluator, used to evaluate CCG. */ /* Limit evaluator, used to evaluate CCG. */
struct OpenSubdiv_EvaluatorDescr *osd_evaluator; 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. * to fill in PTex index of CCGFace.
*/ */
int osd_next_face_ptex_index; int osd_next_face_ptex_index;

2
source/blender/editors/render/render_shading.c
View File

@ -480,7 +480,7 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op))
if (prop) { if (prop) {
/* when creating new ID blocks, use is already 1, but RNA /* 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--; ma->id.us--;
RNA_id_pointer_create(&ma->id, &idptr); RNA_id_pointer_create(&ma->id, &idptr);

5
source/blender/editors/space_file/file_draw.c
View File

@ -655,11 +655,10 @@ void file_draw_list(const bContext *C, ARegion *ar)
sx += (int)layout->column_widths[COLUMN_SIZE] + column_space; sx += (int)layout->column_widths[COLUMN_SIZE] + column_space;
} }
else if (params->display == FILE_LONGDISPLAY) { 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) { if ((file->entry->date_str[0] == '\0') || update_stat_strings) {
BLI_filelist_entry_datetime_to_string( 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( file_draw_string(
sx, sy, file->entry->date_str, layout->column_widths[COLUMN_DATE], layout->tile_h, align); sx, sy, file->entry->date_str, layout->column_widths[COLUMN_DATE], layout->tile_h, align);

4
source/blender/windowmanager/intern/wm_stereo.c
View File

@ -369,7 +369,7 @@ bool WM_stereo3d_enabled(wmWindow *win, bool skip_stereo3d_check)
{ {
bScreen *screen = win->screen; 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 */ * toggle on/off just because there is no 3d elements being drawn */
if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) { if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) {
return GHOST_GetWindowState(win->ghostwin) == GHOST_kWindowStateFullScreen; return GHOST_GetWindowState(win->ghostwin) == GHOST_kWindowStateFullScreen;
@ -379,7 +379,7 @@ bool WM_stereo3d_enabled(wmWindow *win, bool skip_stereo3d_check)
return false; 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 */ * toggle on/off just because there is no 3d elements being drawn */
if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) { if (wm_stereo3d_is_fullscreen_required(win->stereo3d_format->display_mode)) {
return GHOST_GetWindowState(win->ghostwin) == GHOST_kWindowStateFullScreen; return GHOST_GetWindowState(win->ghostwin) == GHOST_kWindowStateFullScreen;