diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-07-11 08:10:05 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-07-11 08:32:59 +0300 |
commit | 651db1b26fa7da3cee4683b10e40f3ef78ae445a (patch) | |
tree | e79974bf7c64fa0e553b7273537e48c65ab06521 | |
parent | 020e0f11ff547f1547fecfdc4765e2e1092a4e2c (diff) |
Cleanup: spelling
-rw-r--r-- | intern/cycles/device/device.cpp | 4 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 31 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_rip.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 13 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_solidify_extrude.c | 2 |
9 files changed, 31 insertions, 31 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index 9dbb33980b4..407f73e8451 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -209,13 +209,13 @@ bool Device::bind_fallback_display_space_shader(const float width, const float h glUseProgram(fallback_shader_program); image_texture_location = glGetUniformLocation(fallback_shader_program, "image_texture"); if (image_texture_location < 0) { - LOG(ERROR) << "Shader doesn't containt the 'image_texture' uniform."; + LOG(ERROR) << "Shader doesn't contain the 'image_texture' uniform."; return false; } fullscreen_location = glGetUniformLocation(fallback_shader_program, "fullscreen"); if (fullscreen_location < 0) { - LOG(ERROR) << "Shader doesn't containt the 'fullscreen' uniform."; + LOG(ERROR) << "Shader doesn't contain the 'fullscreen' uniform."; return false; } diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 5c1f34e3a63..96073c21e79 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1324,7 +1324,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) int revert_to; /* as ICCCM say, we need reply this event - * with a SetInputFocus, the data[1] have + * with a #SetInputFocus, the data[1] have * the valid timestamp (send by the wm). * * Some WM send this event before the @@ -1345,7 +1345,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) else { #ifdef WITH_XDND /* try to handle drag event - * (if there's no such events, GHOST_HandleClientMessage will return zero) */ + * (if there's no such events, #GHOST_HandleClientMessage will return zero) */ if (window->getDropTarget()->GHOST_HandleClientMessage(xe) == false) { /* Unknown client message, ignore */ } @@ -1366,12 +1366,12 @@ void GHOST_SystemX11::processEvent(XEvent *xe) case EnterNotify: case LeaveNotify: { - /* XCrossingEvents pointer leave enter window. - * also do cursor move here, MotionNotify only + /* #XCrossingEvents pointer leave enter window. + * also do cursor move here, #MotionNotify only * happens when motion starts & ends inside window. * we only do moves when the crossing mode is 'normal' - * (really crossing between windows) since some windowmanagers - * also send grab/ungrab crossings for mousewheel events. + * (really crossing between windows) since some window-managers + * also send grab/un-grab crossings for mouse-wheel events. */ XCrossingEvent &xce = xe->xcrossing; if (xce.mode == NotifyNormal) { @@ -1396,11 +1396,11 @@ void GHOST_SystemX11::processEvent(XEvent *xe) case MapNotify: /* * From ICCCM: - * [ Clients can select for StructureNotify on their + * [ Clients can select for #StructureNotify on their * top-level windows to track transition between - * Normal and Iconic states. Receipt of a MapNotify + * Normal and Iconic states. Receipt of a #MapNotify * event will indicate a transition to the Normal - * state, and receipt of an UnmapNotify event will + * state, and receipt of an #UnmapNotify event will * indicate a transition to the Iconic state. ] */ if (window->m_post_init == True) { @@ -1441,7 +1441,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) nxe.xselection.target = xse->target; nxe.xselection.time = xse->time; - /* Check to see if the requestor is asking for String */ + /* Check to see if the requester is asking for String */ if (xse->target == utf8_string || xse->target == string || xse->target == compound_text || xse->target == c_string) { if (xse->selection == XInternAtom(m_display, "PRIMARY", False)) { @@ -1487,7 +1487,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) nxe.xselection.property = None; } - /* Send the event to the client 0 0 == False, SelectionNotify */ + /* Send the event to the client 0 0 == False, #SelectionNotify */ XSendEvent(m_display, xse->requestor, 0, 0, &nxe); XFlush(m_display); break; @@ -1513,7 +1513,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe) /* Note: This event might be generated with incomplete data-set * (don't exactly know why, looks like in some cases, if the value does not change, - * it is not included in subsequent XDeviceMotionEvent events). + * it is not included in subsequent #XDeviceMotionEvent events). * So we have to check which values this event actually contains! */ @@ -1569,14 +1569,13 @@ void GHOST_SystemX11::processEvent(XEvent *xe) GHOST_TSuccess GHOST_SystemX11::getModifierKeys(GHOST_ModifierKeys &keys) const { - /* Analyze the masks returned from XQueryPointer. */ + /* Analyze the masks returned from #XQueryPointer. */ memset((void *)m_keyboard_vector, 0, sizeof(m_keyboard_vector)); XQueryKeymap(m_display, (char *)m_keyboard_vector); - /* now translate key symbols into keycodes and - * test with vector. */ + /* Now translate key symbols into key-codes and test with vector. */ const static KeyCode shift_l = XKeysymToKeycode(m_display, XK_Shift_L); const static KeyCode shift_r = XKeysymToKeycode(m_display, XK_Shift_R); @@ -1671,7 +1670,7 @@ GHOST_TSuccess GHOST_SystemX11::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y { /* This is a brute force move in screen coordinates - * XWarpPointer does relative moves so first determine the + * #XWarpPointer does relative moves so first determine the * current pointer position. */ int cx, cy; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 53e7037218e..647349108e1 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -4363,7 +4363,7 @@ static ImBuf *load_image_single(Image *ima, /* make packed file for autopack */ if ((has_packed == false) && (G.fileflags & G_FILE_AUTOPACK)) { - ImagePackedFile *imapf = MEM_mallocN(sizeof(ImagePackedFile), "Image Packefile"); + ImagePackedFile *imapf = MEM_mallocN(sizeof(ImagePackedFile), "Image Pack-file"); BLI_addtail(&ima->packedfiles, imapf); STRNCPY(imapf->filepath, filepath); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 402d345b99a..d735c9d55fc 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -522,7 +522,7 @@ static void template_id_cb(bContext *C, void *arg_litem, void *arg_event) switch (event) { case UI_ID_BROWSE: case UI_ID_PIN: - RNA_warning("warning, id event %d shouldnt come here", event); + RNA_warning("warning, id event %d shouldn't come here", event); break; case UI_ID_OPEN: case UI_ID_ADD_NEW: diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index 179d73a38ba..0158e12c79c 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -1420,7 +1420,7 @@ void graph_buttons_register(ARegionType *art) pt->poll = graph_panel_drivers_poll; BLI_addtail(&art->paneltypes, pt); - pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers pover"); + pt = MEM_callocN(sizeof(PanelType), "spacetype graph panel drivers popover"); strcpy(pt->idname, "GRAPH_PT_drivers_popover"); strcpy(pt->label, N_("Add/Edit Driver")); strcpy(pt->category, "Drivers"); diff --git a/source/blender/editors/uvedit/uvedit_rip.c b/source/blender/editors/uvedit/uvedit_rip.c index 66903e3eefa..cd518e25971 100644 --- a/source/blender/editors/uvedit/uvedit_rip.c +++ b/source/blender/editors/uvedit/uvedit_rip.c @@ -814,7 +814,7 @@ static bool uv_rip_object(Scene *scene, Object *obedit, const float co[2], const /* Special case: if we have selected faces, isolated them. * This isn't a rip, however it's useful for users as a quick way - * to detech the selection. + * to detach the selection. * * We could also extract an edge loop from the boundary * however in practice it's not that useful, see T78751. */ diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 1670e08325f..97702b06b6f 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -410,7 +410,7 @@ void RNA_def_main(BlenderRNA *brna) srna = RNA_def_struct(brna, "BlendData", NULL); RNA_def_struct_ui_text(srna, - "Blendfile Data", + "Blend-file Data", "Main data structure representing a .blend file and all its data-blocks"); RNA_def_struct_ui_icon(srna, ICON_BLENDER); @@ -436,7 +436,7 @@ void RNA_def_main(BlenderRNA *brna) prop = RNA_def_property(srna, "use_autopack", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_Main_use_autopack_get", "rna_Main_use_autopack_set"); RNA_def_property_ui_text( - prop, "Use Autopack", "Automatically pack all external data into .blend file"); + prop, "Use Auto-pack", "Automatically pack all external data into .blend file"); prop = RNA_def_int_vector(srna, "version", diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 145a505b729..956fb65054b 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3973,12 +3973,13 @@ static void rna_def_userdef_studiolights(BlenderRNA *brna) func = RNA_def_function(srna, "new", "rna_StudioLights_new"); RNA_def_function_ui_description(func, "Create studiolight from default lighting"); - parm = RNA_def_string(func, - "path", - NULL, - 0, - "Path", - "Path to the file that will contain the lighing info (without extension)"); + parm = RNA_def_string( + func, + "path", + NULL, + 0, + "Path", + "Path to the file that will contain the lighting info (without extension)"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); parm = RNA_def_pointer(func, "studio_light", "StudioLight", "", "Newly created StudioLight"); RNA_def_function_return(func, parm); diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.c b/source/blender/modifiers/intern/MOD_solidify_extrude.c index a56194354f8..7e5e4ecd9d3 100644 --- a/source/blender/modifiers/intern/MOD_solidify_extrude.c +++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c @@ -284,7 +284,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex new_edge_arr = MEM_malloc_arrayN(((numEdges * 2) + numVerts), sizeof(*new_edge_arr), __func__); edge_users = MEM_malloc_arrayN(numEdges, sizeof(*edge_users), "solid_mod edges"); - edge_order = MEM_malloc_arrayN(numEdges, sizeof(*edge_order), "solid_mod eorder"); + edge_order = MEM_malloc_arrayN(numEdges, sizeof(*edge_order), "solid_mod order"); /* save doing 2 loops here... */ #if 0 |