Cleanup: spelling
This commit is contained in:
parent
b2d1c4873f
commit
9e96c6d054
|
@ -214,10 +214,10 @@ typedef struct ModifierTypeInfo {
|
||||||
|
|
||||||
/********************* Non-deform modifier functions *********************/
|
/********************* Non-deform modifier functions *********************/
|
||||||
|
|
||||||
/* For non-deform types: apply the modifier and return a mesh datablock.
|
/* For non-deform types: apply the modifier and return a mesh data-block.
|
||||||
*
|
*
|
||||||
* The mesh argument should always be non-NULL; the modifier should use the
|
* The mesh argument should always be non-NULL; the modifier should use the
|
||||||
* passed in mesh datablock rather than object->data, as it contains the mesh
|
* passed in mesh data-block rather than object->data, as it contains the mesh
|
||||||
* with modifier applied up to this point.
|
* with modifier applied up to this point.
|
||||||
*
|
*
|
||||||
* The modifier may modify and return the mesh argument, but must not free it
|
* The modifier may modify and return the mesh argument, but must not free it
|
||||||
|
|
|
@ -4783,11 +4783,11 @@ void psys_get_dupli_texture(ParticleSystem *psys,
|
||||||
|
|
||||||
/* XXX: on checking '(psmd->dm != NULL)'
|
/* XXX: on checking '(psmd->dm != NULL)'
|
||||||
* This is incorrect but needed for metaball evaluation.
|
* This is incorrect but needed for metaball evaluation.
|
||||||
* Ideally this would be calculated via the depsgraph, however with metaballs,
|
* Ideally this would be calculated via the depsgraph, however with meta-balls,
|
||||||
* the entire scenes dupli's are scanned, which also looks into uncalculated data.
|
* the entire scenes dupli's are scanned, which also looks into uncalculated data.
|
||||||
*
|
*
|
||||||
* For now just include this workaround as an alternative to crashing,
|
* For now just include this workaround as an alternative to crashing,
|
||||||
* but longer term metaballs should behave in a more manageable way, see: T46622. */
|
* but longer term meta-balls should behave in a more manageable way, see: T46622. */
|
||||||
|
|
||||||
uv[0] = uv[1] = 0.f;
|
uv[0] = uv[1] = 0.f;
|
||||||
|
|
||||||
|
|
|
@ -716,7 +716,7 @@ static bool ch_is_op(char op)
|
||||||
/**
|
/**
|
||||||
* Helper function for #unit_distribute_negatives to find the next negative to distribute.
|
* Helper function for #unit_distribute_negatives to find the next negative to distribute.
|
||||||
*
|
*
|
||||||
* \note This unecessarily skips the next space if it comes right after the "-"
|
* \note This unnecessarily skips the next space if it comes right after the "-"
|
||||||
* just to make a more predictable output.
|
* just to make a more predictable output.
|
||||||
*/
|
*/
|
||||||
static char *find_next_negative(const char *str, const char *remaining_str)
|
static char *find_next_negative(const char *str, const char *remaining_str)
|
||||||
|
@ -742,7 +742,7 @@ static char *find_next_negative(const char *str, const char *remaining_str)
|
||||||
/**
|
/**
|
||||||
* Helper function for #unit_distribute_negatives to find the next operation, including "-".
|
* Helper function for #unit_distribute_negatives to find the next operation, including "-".
|
||||||
*
|
*
|
||||||
* \note This unecessarily skips the space before the operation character
|
* \note This unnecessarily skips the space before the operation character
|
||||||
* just to make a more predictable output.
|
* just to make a more predictable output.
|
||||||
*/
|
*/
|
||||||
static char *find_next_op(const char *str, char *remaining_str, int len_max)
|
static char *find_next_op(const char *str, char *remaining_str, int len_max)
|
||||||
|
|
|
@ -286,7 +286,7 @@ int BLI_task_parallel_thread_id(const TaskParallelTLS *tls);
|
||||||
* ** Task-Data **
|
* ** Task-Data **
|
||||||
*
|
*
|
||||||
* Typically you want give a task data to work on.
|
* Typically you want give a task data to work on.
|
||||||
* Task data can be shared with other nodes, but be carefull not to free the data multiple times.
|
* Task data can be shared with other nodes, but be careful not to free the data multiple times.
|
||||||
* Task data is freed when calling `BLI_task_graph_free`.
|
* Task data is freed when calling `BLI_task_graph_free`.
|
||||||
*
|
*
|
||||||
* MyData *task_data = MEM_callocN(sizeof(MyData), __func__);
|
* MyData *task_data = MEM_callocN(sizeof(MyData), __func__);
|
||||||
|
|
|
@ -719,10 +719,10 @@ static void non_recursive_bvh_div_nodes_task_cb(void *__restrict userdata,
|
||||||
refit_kdop_hull(data->tree, parent, parent_leafs_begin, parent_leafs_end);
|
refit_kdop_hull(data->tree, parent, parent_leafs_begin, parent_leafs_end);
|
||||||
split_axis = get_largest_axis(parent->bv);
|
split_axis = get_largest_axis(parent->bv);
|
||||||
|
|
||||||
/* Save split axis (this can be used on raytracing to speedup the query time) */
|
/* Save split axis (this can be used on ray-tracing to speedup the query time) */
|
||||||
parent->main_axis = split_axis / 2;
|
parent->main_axis = split_axis / 2;
|
||||||
|
|
||||||
/* Split the childs along the split_axis, note: its not needed to sort the whole leafs array
|
/* Split the children along the split_axis, note: its not needed to sort the whole leafs array
|
||||||
* Only to assure that the elements are partitioned on a way that each child takes the elements
|
* Only to assure that the elements are partitioned on a way that each child takes the elements
|
||||||
* it would take in case the whole array was sorted.
|
* it would take in case the whole array was sorted.
|
||||||
* Split_leafs takes care of that "sort" problem. */
|
* Split_leafs takes care of that "sort" problem. */
|
||||||
|
|
|
@ -39,7 +39,7 @@ typedef struct {
|
||||||
* detect unchanged IDs).
|
* detect unchanged IDs).
|
||||||
* Defined when writing the next step (i.e. last undo step has those always false). */
|
* Defined when writing the next step (i.e. last undo step has those always false). */
|
||||||
bool is_identical_future;
|
bool is_identical_future;
|
||||||
/** Session uuid of the ID being curently written (MAIN_ID_SESSION_UUID_UNSET when not writing
|
/** Session UUID of the ID being currently written (MAIN_ID_SESSION_UUID_UNSET when not writing
|
||||||
* ID-related data). Used to find matching chunks in previous memundo step. */
|
* ID-related data). Used to find matching chunks in previous memundo step. */
|
||||||
uint id_session_uuid;
|
uint id_session_uuid;
|
||||||
} MemFileChunk;
|
} MemFileChunk;
|
||||||
|
|
|
@ -2890,8 +2890,8 @@ static void direct_link_id_common(
|
||||||
id->tag = tag;
|
id->tag = tag;
|
||||||
|
|
||||||
if (tag & LIB_TAG_ID_LINK_PLACEHOLDER) {
|
if (tag & LIB_TAG_ID_LINK_PLACEHOLDER) {
|
||||||
/* For placeholder we only need to set the tag and properly init generic ID fieds above, no
|
/* For placeholder we only need to set the tag and properly initialize generic ID fields above,
|
||||||
* further data to read. */
|
* no further data to read. */
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -244,7 +244,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!MAIN_VERSION_ATLEAST(bmain, 290, 4)) {
|
if (!MAIN_VERSION_ATLEAST(bmain, 290, 4)) {
|
||||||
/* Clear old deprecated bitflag from edit weights modifiers, we now use it for something else.
|
/* Clear old deprecated bit-flag from edit weights modifiers, we now use it for something else.
|
||||||
*/
|
*/
|
||||||
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
|
||||||
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
|
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
|
||||||
|
|
|
@ -4183,7 +4183,7 @@ static bool write_file_handle(Main *mainvar,
|
||||||
memcpy(id_buffer, id, idtype_struct_size);
|
memcpy(id_buffer, id, idtype_struct_size);
|
||||||
|
|
||||||
((ID *)id_buffer)->tag = 0;
|
((ID *)id_buffer)->tag = 0;
|
||||||
/* Those listbase data change everytime we add/remove an ID, and also often when renaming
|
/* Those listbase data change every time we add/remove an ID, and also often when renaming
|
||||||
* one (due to re-sorting). This avoids generating a lot of false 'is changed' detections
|
* one (due to re-sorting). This avoids generating a lot of false 'is changed' detections
|
||||||
* between undo steps. */
|
* between undo steps. */
|
||||||
((ID *)id_buffer)->prev = NULL;
|
((ID *)id_buffer)->prev = NULL;
|
||||||
|
|
|
@ -563,9 +563,9 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
|
||||||
const bool use_depth_shader = use_gpumat && ELEM(ma->blend_method, MA_BM_CLIP, MA_BM_HASHED);
|
const bool use_depth_shader = use_gpumat && ELEM(ma->blend_method, MA_BM_CLIP, MA_BM_HASHED);
|
||||||
|
|
||||||
/* HACK: Assume the struct will never be smaller than our variations.
|
/* HACK: Assume the struct will never be smaller than our variations.
|
||||||
* This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */
|
* This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */
|
||||||
void *key = (char *)ma + is_hair;
|
void *key = (char *)ma + is_hair;
|
||||||
/* Search for other material instances (sharing the same Material datablock). */
|
/* Search for other material instances (sharing the same Material data-block). */
|
||||||
EeveeMaterialCache **emc_p, *emc;
|
EeveeMaterialCache **emc_p, *emc;
|
||||||
if (BLI_ghash_ensure_p(pd->material_hash, key, (void ***)&emc_p)) {
|
if (BLI_ghash_ensure_p(pd->material_hash, key, (void ***)&emc_p)) {
|
||||||
return **emc_p;
|
return **emc_p;
|
||||||
|
@ -641,7 +641,7 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
|
||||||
|
|
||||||
/* Search for the same shaders usage in the pass. */
|
/* Search for the same shaders usage in the pass. */
|
||||||
/* HACK: Assume the struct will never be smaller than our variations.
|
/* HACK: Assume the struct will never be smaller than our variations.
|
||||||
* This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */
|
* This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */
|
||||||
BLI_assert(option <= 16);
|
BLI_assert(option <= 16);
|
||||||
struct GPUShader *sh = GPU_material_get_shader(gpumat);
|
struct GPUShader *sh = GPU_material_get_shader(gpumat);
|
||||||
void *cache_key = (char *)sh + option;
|
void *cache_key = (char *)sh + option;
|
||||||
|
|
|
@ -180,7 +180,7 @@ enum {
|
||||||
/* Material shader cache keys */
|
/* Material shader cache keys */
|
||||||
enum {
|
enum {
|
||||||
/* HACK: This assumes the struct GPUShader will never be smaller than our variations.
|
/* HACK: This assumes the struct GPUShader will never be smaller than our variations.
|
||||||
* This allow us to only keep one ghash and avoid bigger keys comparissons/hashing.
|
* This allow us to only keep one ghash and avoid bigger keys comparisons/hashing.
|
||||||
* We combine the GPUShader pointer with the key. */
|
* We combine the GPUShader pointer with the key. */
|
||||||
KEY_CULL = (1 << 0),
|
KEY_CULL = (1 << 0),
|
||||||
KEY_REFRACT = (1 << 1),
|
KEY_REFRACT = (1 << 1),
|
||||||
|
|
|
@ -215,7 +215,7 @@ void EEVEE_renderpasses_output_init(EEVEE_ViewLayerData *sldata,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Postprocess data to construct a specific renderpass
|
/* Post-process data to construct a specific render-pass
|
||||||
*
|
*
|
||||||
* This method will create a shading group to perform the post-processing for the given
|
* This method will create a shading group to perform the post-processing for the given
|
||||||
* `renderpass_type`. The post-processing will be done and the result will be stored in the
|
* `renderpass_type`. The post-processing will be done and the result will be stored in the
|
||||||
|
@ -223,7 +223,7 @@ void EEVEE_renderpasses_output_init(EEVEE_ViewLayerData *sldata,
|
||||||
*
|
*
|
||||||
* Only invoke this function for passes that need post-processing.
|
* Only invoke this function for passes that need post-processing.
|
||||||
*
|
*
|
||||||
* After invoking this function the active framebuffer is set to `vedata->fbl->renderpass_fb`. */
|
* After invoking this function the active frame-buffer is set to `vedata->fbl->renderpass_fb`. */
|
||||||
void EEVEE_renderpasses_postprocess(EEVEE_ViewLayerData *UNUSED(sldata),
|
void EEVEE_renderpasses_postprocess(EEVEE_ViewLayerData *UNUSED(sldata),
|
||||||
EEVEE_Data *vedata,
|
EEVEE_Data *vedata,
|
||||||
eViewLayerEEVEEPassType renderpass_type)
|
eViewLayerEEVEEPassType renderpass_type)
|
||||||
|
|
|
@ -738,7 +738,7 @@ struct GPUMaterial *EEVEE_material_get(
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Meh, implicit option. World probe cannot be deferred because they need
|
/* Meh, implicit option. World probe cannot be deferred because they need
|
||||||
* to be rendered immediatly. */
|
* to be rendered immediately. */
|
||||||
const bool deferred = (options & VAR_WORLD_PROBE) == 0;
|
const bool deferred = (options & VAR_WORLD_PROBE) == 0;
|
||||||
|
|
||||||
GPUMaterial *mat = eevee_material_get_ex(scene, ma, wo, options, deferred);
|
GPUMaterial *mat = eevee_material_get_ex(scene, ma, wo, options, deferred);
|
||||||
|
|
|
@ -5086,7 +5086,7 @@ void mesh_buffer_cache_create_requested(struct TaskGraph *task_graph,
|
||||||
EXTRACT(ibo, edituv_points);
|
EXTRACT(ibo, edituv_points);
|
||||||
EXTRACT(ibo, edituv_fdots);
|
EXTRACT(ibo, edituv_fdots);
|
||||||
|
|
||||||
/* Only create the edge when there are user datas that needs to be inited.
|
/* Only create the edge when there is user data that needs to be initialized.
|
||||||
* The task is still part of the graph so the task_data will be freed when the graph is freed.
|
* The task is still part of the graph so the task_data will be freed when the graph is freed.
|
||||||
*/
|
*/
|
||||||
if (!BLI_listbase_is_empty(&user_data_init_task_data->task_datas)) {
|
if (!BLI_listbase_is_empty(&user_data_init_task_data->task_datas)) {
|
||||||
|
|
|
@ -203,7 +203,7 @@ static void draw_parallel_lines(const ParallelLinesSet *lines,
|
||||||
|
|
||||||
immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
|
immBindBuiltinProgram(GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR);
|
||||||
immUniform2fv("viewportSize", &viewport[2]);
|
immUniform2fv("viewportSize", &viewport[2]);
|
||||||
/* -1.0f offset here is because the line is too fat due to the builtin antialiasing.
|
/* -1.0f offset here is because the line is too fat due to the builtin anti-aliasing.
|
||||||
* TODO make a variant or a uniform to toggle it off. */
|
* TODO make a variant or a uniform to toggle it off. */
|
||||||
immUniform1f("lineWidth", U.pixelsize - 1.0f);
|
immUniform1f("lineWidth", U.pixelsize - 1.0f);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2540,7 +2540,7 @@ static int make_override_library_exec(bContext *C, wmOperator *op)
|
||||||
}
|
}
|
||||||
FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
|
FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
|
||||||
|
|
||||||
/* Remove the instance empty from this scene, the items now have an overriden collection
|
/* Remove the instance empty from this scene, the items now have an overridden collection
|
||||||
* instead. */
|
* instead. */
|
||||||
ED_object_base_free_and_unlink(bmain, scene, obcollection);
|
ED_object_base_free_and_unlink(bmain, scene, obcollection);
|
||||||
|
|
||||||
|
|
|
@ -655,7 +655,7 @@ static int sequencer_add_movie_strip_invoke(bContext *C,
|
||||||
Scene *scene = CTX_data_scene(C);
|
Scene *scene = CTX_data_scene(C);
|
||||||
Editing *ed = BKE_sequencer_editing_get(scene, false);
|
Editing *ed = BKE_sequencer_editing_get(scene, false);
|
||||||
|
|
||||||
/* Only enable "use_framerate" if there aren't any existing strips, unless overriden by user. */
|
/* Only enable "use_framerate" if there aren't any existing strips, unless overridden by user. */
|
||||||
if (ed && ed->seqbasep && ed->seqbasep->first) {
|
if (ed && ed->seqbasep && ed->seqbasep->first) {
|
||||||
RNA_boolean_set(op->ptr, "use_framerate", false);
|
RNA_boolean_set(op->ptr, "use_framerate", false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1592,15 +1592,15 @@ class SShape {
|
||||||
|
|
||||||
/*! Splits an edge into several edges.
|
/*! Splits an edge into several edges.
|
||||||
* The edge's vertices are passed rather than the edge itself. This way, all feature edges
|
* The edge's vertices are passed rather than the edge itself. This way, all feature edges
|
||||||
* (SILHOUETTE, CREASE, BORDER) are splitted in the same time. The processed edges are flagged as
|
* (SILHOUETTE, CREASE, BORDER) are split in the same time. The processed edges are flagged as
|
||||||
* done (using the userdata flag).One single new vertex is created whereas several splitted edges
|
* done (using the user-data flag).One single new vertex is created whereas several split edges
|
||||||
* might created for the different kinds of edges. These new elements are added to the lists
|
* might created for the different kinds of edges. These new elements are added to the lists
|
||||||
* maintained by the shape.
|
* maintained by the shape.
|
||||||
* New chains are also created.
|
* New chains are also created.
|
||||||
* ioA
|
* ioA
|
||||||
* The first vertex for the edge that gets splitted
|
* The first vertex for the edge that gets split.
|
||||||
* ioB
|
* ioB
|
||||||
* The second vertex for the edge that gets splitted
|
* The second vertex for the edge that gets split.
|
||||||
* iParameters
|
* iParameters
|
||||||
* A vector containing 2D real vectors indicating the parameters giving the intersections
|
* A vector containing 2D real vectors indicating the parameters giving the intersections
|
||||||
* coordinates in 3D and in 2D. These intersections points must be sorted from B to A. Each
|
* coordinates in 3D and in 2D. These intersections points must be sorted from B to A. Each
|
||||||
|
|
|
@ -304,8 +304,8 @@ void gpu_extensions_init(void)
|
||||||
GG.context_local_shaders_workaround = GLEW_ARB_get_program_binary;
|
GG.context_local_shaders_workaround = GLEW_ARB_get_program_binary;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Special fix for theses specific GPUs. Without thoses workaround, blender crashes on strartup.
|
/* Special fix for theses specific GPUs.
|
||||||
* (see T72098) */
|
* Without this workaround, blender crashes on startup. (see T72098) */
|
||||||
if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) &&
|
if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) &&
|
||||||
(strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) {
|
(strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) {
|
||||||
GG.mip_render_workaround = true;
|
GG.mip_render_workaround = true;
|
||||||
|
|
|
@ -1189,7 +1189,7 @@ typedef enum eColorPicker_Types {
|
||||||
} eColorPicker_Types;
|
} eColorPicker_Types;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Timecode display styles
|
* Time-code display styles.
|
||||||
* #UserDef.timecode_style
|
* #UserDef.timecode_style
|
||||||
*/
|
*/
|
||||||
typedef enum eTimecodeStyles {
|
typedef enum eTimecodeStyles {
|
||||||
|
|
|
@ -228,7 +228,7 @@ static void rna_Fluid_flip_parts_update(Main *bmain, Scene *scene, PointerRNA *p
|
||||||
bool exists = rna_Fluid_parts_exists(ptr, PART_FLUID_FLIP);
|
bool exists = rna_Fluid_parts_exists(ptr, PART_FLUID_FLIP);
|
||||||
|
|
||||||
/* Only create a particle system in liquid domain mode.
|
/* Only create a particle system in liquid domain mode.
|
||||||
* Remove any remainings of a liquid sim when switching to gas. */
|
* Remove any remaining data from a liquid sim when switching to gas. */
|
||||||
if (mmd->domain->type != FLUID_DOMAIN_TYPE_LIQUID) {
|
if (mmd->domain->type != FLUID_DOMAIN_TYPE_LIQUID) {
|
||||||
rna_Fluid_parts_delete(ptr, PART_FLUID_FLIP);
|
rna_Fluid_parts_delete(ptr, PART_FLUID_FLIP);
|
||||||
mmd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_FLIP;
|
mmd->domain->particle_type &= ~FLUID_DOMAIN_PARTICLE_FLIP;
|
||||||
|
|
Loading…
Reference in New Issue