Cleanup: spelling in comments
This commit is contained in:
parent
483bc6c9c1
commit
62346abc02
@ -105,7 +105,7 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext()
|
|||||||
GHOST_X11_ERROR_HANDLERS_OVERRIDE(handler_store);
|
GHOST_X11_ERROR_HANDLERS_OVERRIDE(handler_store);
|
||||||
|
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
/* Begin Inline Glew */
|
/* Begin Inline GLEW. */
|
||||||
|
|
||||||
#ifdef USE_GLXEW_INIT_WORKAROUND
|
#ifdef USE_GLXEW_INIT_WORKAROUND
|
||||||
const GLubyte *extStart = (GLubyte *)"";
|
const GLubyte *extStart = (GLubyte *)"";
|
||||||
@ -142,11 +142,11 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext()
|
|||||||
"GLX_EXT_create_context_es2_profile", extStart, extEnd);
|
"GLX_EXT_create_context_es2_profile", extStart, extEnd);
|
||||||
# endif /* WITH_GLEW_ES */
|
# endif /* WITH_GLEW_ES */
|
||||||
|
|
||||||
/* End Inline Glew */
|
/* End Inline GLEW. */
|
||||||
/* -------------------------------------------------------------------- */
|
/* -------------------------------------------------------------------- */
|
||||||
#else
|
#else
|
||||||
/* important to initialize only glxew (_not_ glew),
|
/* Important to initialize only glxew (_not_ GLEW),
|
||||||
* since this breaks w/ Mesa's `swrast`, see: T46431 */
|
* since this breaks w/ Mesa's `swrast`, see: T46431. */
|
||||||
glxewInit();
|
glxewInit();
|
||||||
#endif /* USE_GLXEW_INIT_WORKAROUND */
|
#endif /* USE_GLXEW_INIT_WORKAROUND */
|
||||||
|
|
||||||
@ -395,7 +395,7 @@ int GHOST_X11_GL_GetAttributes(
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* excuse inlining part of glew */
|
/* Excuse inlining part of GLEW. */
|
||||||
#ifdef USE_GLXEW_INIT_WORKAROUND
|
#ifdef USE_GLXEW_INIT_WORKAROUND
|
||||||
static GLuint _glewStrLen(const GLubyte *s)
|
static GLuint _glewStrLen(const GLubyte *s)
|
||||||
{
|
{
|
||||||
|
@ -153,7 +153,7 @@ struct input_t {
|
|||||||
* wl_fixed_to_int(scale * input->xy[0]),
|
* wl_fixed_to_int(scale * input->xy[0]),
|
||||||
* wl_fixed_to_int(scale * input->xy[1]),
|
* wl_fixed_to_int(scale * input->xy[1]),
|
||||||
* };
|
* };
|
||||||
* \endocde
|
* \endcode
|
||||||
*/
|
*/
|
||||||
wl_fixed_t xy[2] = {0, 0};
|
wl_fixed_t xy[2] = {0, 0};
|
||||||
GHOST_Buttons buttons = GHOST_Buttons();
|
GHOST_Buttons buttons = GHOST_Buttons();
|
||||||
@ -1860,14 +1860,12 @@ static void xdg_output_handle_logical_size(void *data,
|
|||||||
|
|
||||||
if (output->size_logical[0] != 0 && output->size_logical[1] != 0) {
|
if (output->size_logical[0] != 0 && output->size_logical[1] != 0) {
|
||||||
/* Original comment from SDL. */
|
/* Original comment from SDL. */
|
||||||
/* FIXME: GNOME has a bug where the logical size does not account for
|
/* FIXME(@flibit): GNOME has a bug where the logical size does not account for
|
||||||
* scale, resulting in bogus viewport sizes.
|
* scale, resulting in bogus viewport sizes.
|
||||||
*
|
*
|
||||||
* Until this is fixed, validate that _some_ kind of scaling is being
|
* Until this is fixed, validate that _some_ kind of scaling is being
|
||||||
* done (we can't match exactly because fractional scaling can't be
|
* done (we can't match exactly because fractional scaling can't be
|
||||||
* detected otherwise), then override if necessary.
|
* detected otherwise), then override if necessary. */
|
||||||
* -flibit
|
|
||||||
*/
|
|
||||||
if ((output->size_logical[0] == width) && (output->scale_fractional == wl_fixed_from_int(1))) {
|
if ((output->size_logical[0] == width) && (output->scale_fractional == wl_fixed_from_int(1))) {
|
||||||
GHOST_PRINT("xdg_output scale did not match, overriding with wl_output scale");
|
GHOST_PRINT("xdg_output scale did not match, overriding with wl_output scale");
|
||||||
return;
|
return;
|
||||||
|
@ -678,7 +678,7 @@ static void copy_frame_to_eval_cb(bGPDlayer *gpl,
|
|||||||
|
|
||||||
static void gpencil_copy_visible_frames_to_eval(Depsgraph *depsgraph, Scene *scene, Object *ob)
|
static void gpencil_copy_visible_frames_to_eval(Depsgraph *depsgraph, Scene *scene, Object *ob)
|
||||||
{
|
{
|
||||||
/* Remap layers'active frame with time modifiers applied. */
|
/* Remap layers active frame with time modifiers applied. */
|
||||||
bGPdata *gpd_eval = ob->data;
|
bGPdata *gpd_eval = ob->data;
|
||||||
LISTBASE_FOREACH (bGPDlayer *, gpl_eval, &gpd_eval->layers) {
|
LISTBASE_FOREACH (bGPDlayer *, gpl_eval, &gpd_eval->layers) {
|
||||||
bGPDframe *gpf_eval = gpl_eval->actframe;
|
bGPDframe *gpf_eval = gpl_eval->actframe;
|
||||||
|
@ -4102,7 +4102,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
|||||||
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
||||||
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
|
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
|
||||||
if (md->type == eModifierType_DataTransfer) {
|
if (md->type == eModifierType_DataTransfer) {
|
||||||
/* Now datatransfer's mix factor is multiplied with weights when any,
|
/* Now data-transfer's mix factor is multiplied with weights when any,
|
||||||
* instead of being ignored,
|
* instead of being ignored,
|
||||||
* we need to take care of that to keep 'old' files compatible. */
|
* we need to take care of that to keep 'old' files compatible. */
|
||||||
DataTransferModifierData *dtmd = (DataTransferModifierData *)md;
|
DataTransferModifierData *dtmd = (DataTransferModifierData *)md;
|
||||||
|
@ -669,7 +669,7 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
|||||||
short etype = event->type;
|
short etype = event->type;
|
||||||
short eval = event->val;
|
short eval = event->val;
|
||||||
|
|
||||||
/* When activated from toolbar, need to convert leftmouse release to confirm */
|
/* When activated from toolbar, need to convert left-mouse release to confirm. */
|
||||||
if (ELEM(etype, LEFTMOUSE, opdata->launch_event) && (eval == KM_RELEASE) &&
|
if (ELEM(etype, LEFTMOUSE, opdata->launch_event) && (eval == KM_RELEASE) &&
|
||||||
RNA_boolean_get(op->ptr, "release_confirm")) {
|
RNA_boolean_get(op->ptr, "release_confirm")) {
|
||||||
etype = EVT_MODAL_MAP;
|
etype = EVT_MODAL_MAP;
|
||||||
|
@ -78,7 +78,7 @@ static void geom_add_vertex(Geometry *geom,
|
|||||||
p = parse_floats(p, end, 0.0f, vert, 3);
|
p = parse_floats(p, end, 0.0f, vert, 3);
|
||||||
r_global_vertices.vertices.append(vert);
|
r_global_vertices.vertices.append(vert);
|
||||||
geom->vertex_count_++;
|
geom->vertex_count_++;
|
||||||
/* OBJ extension: "xyzrgb" vertex colors, when the vertex position
|
/* OBJ extension: `xyzrgb` vertex colors, when the vertex position
|
||||||
* is followed by 3 more RGB color components. See
|
* is followed by 3 more RGB color components. See
|
||||||
* http://paulbourke.net/dataformats/obj/colour.html */
|
* http://paulbourke.net/dataformats/obj/colour.html */
|
||||||
if (p < end) {
|
if (p < end) {
|
||||||
|
@ -247,10 +247,9 @@ typedef struct bArmatureConstraint {
|
|||||||
typedef struct bTrackToConstraint {
|
typedef struct bTrackToConstraint {
|
||||||
struct Object *tar;
|
struct Object *tar;
|
||||||
/**
|
/**
|
||||||
* I'll be using reserved1 and reserved2 as Track and Up flags,
|
* NOTE(@theeth): I'll be using reserved1 and reserved2 as Track and Up flags,
|
||||||
* not sure if that's what they were intended for anyway.
|
* not sure if that's what they were intended for anyway.
|
||||||
* Not sure either if it would create backward incompatibility if I were to rename them.
|
* Not sure either if it would create backward incompatibility if I were to rename them.
|
||||||
* - theeth
|
|
||||||
*/
|
*/
|
||||||
int reserved1;
|
int reserved1;
|
||||||
int reserved2;
|
int reserved2;
|
||||||
|
@ -338,7 +338,7 @@ typedef struct Ipo {
|
|||||||
#define CAM_STA 2
|
#define CAM_STA 2
|
||||||
#define CAM_END 3
|
#define CAM_END 3
|
||||||
|
|
||||||
/* yafray aperture & focal distance curves */
|
/* YAFRAY aperture & focal distance curves. */
|
||||||
#define CAM_YF_APERT 4
|
#define CAM_YF_APERT 4
|
||||||
#define CAM_YF_FDIST 5
|
#define CAM_YF_FDIST 5
|
||||||
|
|
||||||
|
@ -120,7 +120,7 @@ typedef struct Light {
|
|||||||
/* #define LA_NO_DIFF (1 << 11) */ /* not used anywhere */
|
/* #define LA_NO_DIFF (1 << 11) */ /* not used anywhere */
|
||||||
/* #define LA_NO_SPEC (1 << 12) */ /* not used anywhere */
|
/* #define LA_NO_SPEC (1 << 12) */ /* not used anywhere */
|
||||||
/* #define LA_SHAD_RAY (1 << 13) */ /* not used anywhere - cleaned */
|
/* #define LA_SHAD_RAY (1 << 13) */ /* not used anywhere - cleaned */
|
||||||
/* yafray: light shadowbuffer flag, softlight */
|
/* YAFRAY: light shadow-buffer flag, soft-light. */
|
||||||
/* Since it is used with LOCAL light, can't use LA_SHAD */
|
/* Since it is used with LOCAL light, can't use LA_SHAD */
|
||||||
/* #define LA_YF_SOFT (1 << 14) */ /* not used anymore */
|
/* #define LA_YF_SOFT (1 << 14) */ /* not used anymore */
|
||||||
/* #define LA_LAYER_SHADOW (1 << 15) */ /* not used anymore */
|
/* #define LA_LAYER_SHADOW (1 << 15) */ /* not used anymore */
|
||||||
|
@ -463,14 +463,19 @@ typedef struct wmKeyMap {
|
|||||||
|
|
||||||
/** #wmKeyMap.flag */
|
/** #wmKeyMap.flag */
|
||||||
enum {
|
enum {
|
||||||
KEYMAP_MODAL = (1 << 0), /* modal map, not using operatornames */
|
/** Modal map, not using operator-names. */
|
||||||
KEYMAP_USER = (1 << 1), /* user keymap */
|
KEYMAP_MODAL = (1 << 0),
|
||||||
|
/** User key-map. */
|
||||||
|
KEYMAP_USER = (1 << 1),
|
||||||
KEYMAP_EXPANDED = (1 << 2),
|
KEYMAP_EXPANDED = (1 << 2),
|
||||||
KEYMAP_CHILDREN_EXPANDED = (1 << 3),
|
KEYMAP_CHILDREN_EXPANDED = (1 << 3),
|
||||||
KEYMAP_DIFF = (1 << 4), /* diff keymap for user preferences */
|
/** Diff key-map for user preferences. */
|
||||||
KEYMAP_USER_MODIFIED = (1 << 5), /* keymap has user modifications */
|
KEYMAP_DIFF = (1 << 4),
|
||||||
|
/** Key-map has user modifications. */
|
||||||
|
KEYMAP_USER_MODIFIED = (1 << 5),
|
||||||
KEYMAP_UPDATE = (1 << 6),
|
KEYMAP_UPDATE = (1 << 6),
|
||||||
KEYMAP_TOOL = (1 << 7), /* keymap for active tool system */
|
/** key-map for active tool system. */
|
||||||
|
KEYMAP_TOOL = (1 << 7),
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -825,7 +825,7 @@ void render_result_merge(RenderResult *rr, RenderResult *rrpart)
|
|||||||
if (rpass->rect == NULL || rpassp->rect == NULL) {
|
if (rpass->rect == NULL || rpassp->rect == NULL) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
/* Renderresult have all passes, renderpart only the active view's passes. */
|
/* Render-result have all passes, render-part only the active view's passes. */
|
||||||
if (!STREQ(rpassp->fullname, rpass->fullname)) {
|
if (!STREQ(rpassp->fullname, rpass->fullname)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user