forked from bartvdbraak/blender
code cleanup: spelling
This commit is contained in:
parent
50d1129a57
commit
beae4f498d
@ -2,7 +2,7 @@
|
||||
* compatibility macros to make every ffmpeg installation appear
|
||||
* like the most current installation (wrapping some functionality sometimes)
|
||||
* it also includes all ffmpeg header files at once, no need to do it
|
||||
* seperately.
|
||||
* separately.
|
||||
*
|
||||
* Copyright (c) 2011 Peter Schlaile
|
||||
*
|
||||
|
@ -525,7 +525,7 @@ int cocoa_request_qtcodec_settings(bContext *C, wmOperator *op)
|
||||
return NSTerminateCancel;
|
||||
}
|
||||
|
||||
// To avoid cancelling a log off process, we must use Cocoa termination process
|
||||
// To avoid canceling a log off process, we must use Cocoa termination process
|
||||
// And this function is the only chance to perform clean up
|
||||
// So WM_exit needs to be called directly, as the event loop will never run before termination
|
||||
- (void)applicationWillTerminate:(NSNotification *)aNotification
|
||||
|
@ -285,7 +285,7 @@ void animviz_get_object_motionpaths(Object *ob, ListBase *targets)
|
||||
/* ........ */
|
||||
|
||||
/* Note on evaluation optimizations:
|
||||
* Optimisations currently used here play tricks with the depsgraph in order to try and
|
||||
* Optimization's currently used here play tricks with the depsgraph in order to try and
|
||||
* evaluate as few objects as strictly necessary to get nicer performance under standard
|
||||
* production conditions. For those people who really need the accurate version,
|
||||
* disable the ifdef (i.e. 1 -> 0) and comment out the call to motionpaths_calc_optimise_depsgraph()
|
||||
|
@ -762,7 +762,7 @@ float BKE_brush_sample_masktex(const Scene *scene, Brush *br,
|
||||
* radius become inconsistent.
|
||||
* the biggest problem is that it isn't possible to change
|
||||
* unprojected radius because a view context is not
|
||||
* available. my ussual solution to this is to use the
|
||||
* available. my usual solution to this is to use the
|
||||
* ratio of change of the size to change the unprojected
|
||||
* radius. Not completely convinced that is correct.
|
||||
* In any case, a better solution is needed to prevent
|
||||
|
@ -557,7 +557,7 @@ BVHTree *bvhtree_from_mesh_verts(BVHTreeFromMesh *data, DerivedMesh *dm, float e
|
||||
data->cached = true;
|
||||
|
||||
/* a NULL nearest callback works fine
|
||||
* remeber the min distance to point is the same as the min distance to BV of point */
|
||||
* remember the min distance to point is the same as the min distance to BV of point */
|
||||
data->nearest_callback = NULL;
|
||||
data->raycast_callback = NULL;
|
||||
|
||||
|
@ -1114,8 +1114,8 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm )
|
||||
if ( numedges==0 )
|
||||
return 0;
|
||||
|
||||
/* NOTE: handling ownership of sptings and edgehash is quite sloppy
|
||||
* currenlty they are never initialized but assert just to be sure */
|
||||
/* NOTE: handling ownership of springs and edgehash is quite sloppy
|
||||
* currently they are never initialized but assert just to be sure */
|
||||
BLI_assert(cloth->springs == NULL);
|
||||
BLI_assert(cloth->edgehash == NULL);
|
||||
|
||||
|
@ -34,7 +34,7 @@
|
||||
* to three loops per triangle. the derivedmesh stores a cache of tessellations
|
||||
* for each face. this cache will smartly update as needed (though at first
|
||||
* it'll simply be more brute force). keeping track of face/edge counts may
|
||||
* be a small problbm.
|
||||
* be a small problem.
|
||||
*
|
||||
* this won't be the most efficient thing, considering that internal edges and
|
||||
* faces of tessellations are exposed. looking up an edge by index in particular
|
||||
|
@ -2241,7 +2241,7 @@ void BKE_image_signal(Image *ima, ImageUser *iuser, int signal)
|
||||
#else
|
||||
/* image buffers for non-sequence multilayer will share buffers with RenderResult,
|
||||
* however sequence multilayer will own buffers. Such logic makes switching from
|
||||
* single multilayer file to sequence completely instable
|
||||
* single multilayer file to sequence completely unstable
|
||||
* since changes in nodes seems this workaround isn't needed anymore, all sockets
|
||||
* are nicely detecting anyway, but freeing buffers always here makes multilayer
|
||||
* sequences behave stable
|
||||
|
@ -2850,10 +2850,10 @@ static void sphclassical_force_cb(void *sphdata_v, ParticleKey *state, float *fo
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Find vector to neighbour. Exclude particles that are more than 2h
|
||||
/* Find vector to neighbor. Exclude particles that are more than 2h
|
||||
* away. Can't use current state here because it may have changed on
|
||||
* another thread - so do own mini integration. Unlike basic_integrate,
|
||||
* SPH integration depends on neighbouring particles. - z0r */
|
||||
* SPH integration depends on neighboring particles. - z0r */
|
||||
madd_v3_v3v3fl(co, npa->prev_state.co, npa->prev_state.vel, state->time);
|
||||
sub_v3_v3v3(vec, co, state->co);
|
||||
rij = normalize_v3(vec);
|
||||
|
@ -1211,7 +1211,7 @@ void BKE_rigidbody_sync_transforms(RigidBodyWorld *rbw, Object *ob, float ctime)
|
||||
}
|
||||
}
|
||||
|
||||
/* Used when cancelling transforms - return rigidbody and object to initial states */
|
||||
/* Used when canceling transforms - return rigidbody and object to initial states */
|
||||
void BKE_rigidbody_aftertrans_update(Object *ob, float loc[3], float rot[3], float quat[4], float rotAxis[3], float rotAngle)
|
||||
{
|
||||
RigidBodyOb *rbo = ob->rigidbody_object;
|
||||
|
@ -52,7 +52,7 @@ typedef struct VoronoiEdge {
|
||||
float f, g; /* directional coeffitients satisfying equation y = f * x + g (edge lies on this line) */
|
||||
|
||||
/* some edges consist of two parts, so we add the pointer to another part to connect them at the end of an algorithm */
|
||||
struct VoronoiEdge *neighbour;
|
||||
struct VoronoiEdge *neighbor;
|
||||
} VoronoiEdge;
|
||||
|
||||
typedef struct VoronoiTriangulationPoint {
|
||||
|
@ -99,7 +99,7 @@ static VoronoiEdge *voronoiEdge_new(float start[2], float left[2], float right[2
|
||||
copy_v2_v2(edge->left, left);
|
||||
copy_v2_v2(edge->right, right);
|
||||
|
||||
edge->neighbour = NULL;
|
||||
edge->neighbor = NULL;
|
||||
edge->end[0] = 0;
|
||||
edge->end[1] = 0;
|
||||
|
||||
@ -395,7 +395,7 @@ static void voronoi_addParabola(VoronoiProcess *process, float site[2])
|
||||
el = voronoiEdge_new(start, par->site, site);
|
||||
er = voronoiEdge_new(start, site, par->site);
|
||||
|
||||
el->neighbour = er;
|
||||
el->neighbor = er;
|
||||
BLI_addtail(&process->edges, el);
|
||||
|
||||
par->edge = er;
|
||||
@ -682,9 +682,9 @@ void BLI_voronoi_compute(const VoronoiSite *sites, int sites_total, int width, i
|
||||
|
||||
edge = process.edges.first;
|
||||
while (edge) {
|
||||
if (edge->neighbour) {
|
||||
copy_v2_v2(edge->start, edge->neighbour->end);
|
||||
MEM_freeN(edge->neighbour);
|
||||
if (edge->neighbor) {
|
||||
copy_v2_v2(edge->start, edge->neighbor->end);
|
||||
MEM_freeN(edge->neighbor);
|
||||
}
|
||||
|
||||
edge = edge->next;
|
||||
|
@ -701,7 +701,7 @@ void ArmatureImporter::make_shape_keys()
|
||||
|
||||
//insert other shape keys
|
||||
for (int i = 0 ; i < morphTargetIds.getCount() ; i++ ) {
|
||||
//better to have a seperate map of morph objects,
|
||||
//better to have a separate map of morph objects,
|
||||
//This'll do for now since only mesh morphing is imported
|
||||
|
||||
Mesh *me = this->mesh_importer->get_mesh_by_geom_uid(morphTargetIds[i]);
|
||||
|
@ -39,7 +39,7 @@ void DespeckleNode::convertToOperations(ExecutionSystem *graph, CompositorContex
|
||||
|
||||
operation->setbNode(editorNode);
|
||||
operation->setThreshold(editorNode->custom3);
|
||||
operation->setThresholdNeighbour(editorNode->custom4);
|
||||
operation->setThresholdNeighbor(editorNode->custom4);
|
||||
|
||||
inputImageSocket->relinkConnections(operation->getInputSocket(0), 1, graph);
|
||||
inputSocket->relinkConnections(operation->getInputSocket(1), 0, graph);
|
||||
|
@ -114,7 +114,7 @@ void DespeckleOperation::executePixel(float output[4], int x, int y, void *data)
|
||||
//mul_v4_fl(color_mid, 1.0f / w);
|
||||
|
||||
if ((w != 0.0f) &&
|
||||
((w / WTOT) > (this->m_threshold_neighbour)) &&
|
||||
((w / WTOT) > (this->m_threshold_neighbor)) &&
|
||||
color_diff(color_mid, color_org, this->m_threshold))
|
||||
{
|
||||
mul_v4_fl(color_mid_ok, 1.0f / w);
|
||||
|
@ -25,7 +25,7 @@
|
||||
class DespeckleOperation : public NodeOperation {
|
||||
private:
|
||||
float m_threshold;
|
||||
float m_threshold_neighbour;
|
||||
float m_threshold_neighbor;
|
||||
|
||||
// int m_filterWidth;
|
||||
// int m_filterHeight;
|
||||
@ -40,7 +40,7 @@ public:
|
||||
void executePixel(float output[4], int x, int y, void *data);
|
||||
|
||||
void setThreshold(float threshold) { this->m_threshold = threshold; }
|
||||
void setThresholdNeighbour(float threshold) { this->m_threshold_neighbour = threshold; }
|
||||
void setThresholdNeighbor(float threshold) { this->m_threshold_neighbor = threshold; }
|
||||
|
||||
void initExecution();
|
||||
void deinitExecution();
|
||||
|
@ -76,7 +76,7 @@ void free_anim_drivers_copybuf(void);
|
||||
*
|
||||
* - add: 0 - don't add anything if not found,
|
||||
* 1 - add new Driver FCurve (with keyframes for visual tweaking),
|
||||
* 2 - add new Driver FCurve (with generator, for script backwards compatability)
|
||||
* 2 - add new Driver FCurve (with generator, for script backwards compatibility)
|
||||
* -1 - add new Driver FCurve without driver stuff (for pasting)
|
||||
*/
|
||||
FCurve *verify_driver_fcurve(ID *id, const char rna_path[], const int array_index, short add)
|
||||
@ -125,7 +125,7 @@ FCurve *verify_driver_fcurve(ID *id, const char rna_path[], const int array_inde
|
||||
/* F-Modifier or Keyframes? */
|
||||
// FIXME: replace these magic numbers with defines
|
||||
if (add == 2) {
|
||||
/* Python API Backwards compatability hack:
|
||||
/* Python API Backwards compatibility hack:
|
||||
* Create FModifier so that old scripts won't break
|
||||
* for now before 2.7 series -- (September 4, 2013)
|
||||
*/
|
||||
|
@ -843,7 +843,7 @@ static int armature_switch_direction_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
armature_tag_select_mirrored(arm);
|
||||
|
||||
/* clear BONE_TRANSFORM flags
|
||||
* - used to prevent duplicate/cancelling operations from occurring [#34123]
|
||||
* - used to prevent duplicate/canceling operations from occurring [#34123]
|
||||
* - BONE_DONE cannot be used here as that's already used for mirroring
|
||||
*/
|
||||
armature_clear_swap_done_flags(arm);
|
||||
|
@ -454,7 +454,7 @@ void ED_armature_from_edit(Object *obedit)
|
||||
/* armature bones */
|
||||
BKE_armature_bonelist_free(&arm->bonebase);
|
||||
|
||||
/* remove zero sized bones, this gives instable restposes */
|
||||
/* remove zero sized bones, this gives unstable restposes */
|
||||
for (eBone = arm->edbo->first; eBone; eBone = neBone) {
|
||||
float len = len_v3v3(eBone->head, eBone->tail);
|
||||
neBone = eBone->next;
|
||||
|
@ -1874,7 +1874,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
||||
//printf("\tGP - handle modal event...\n");
|
||||
|
||||
/* exit painting mode (and/or end current stroke)
|
||||
* NOTE: cannot do RIGHTMOUSE (as is standard for cancelling) as that would break polyline [#32647]
|
||||
* NOTE: cannot do RIGHTMOUSE (as is standard for canceling) as that would break polyline [#32647]
|
||||
*/
|
||||
if (ELEM4(event->type, RETKEY, PADENTER, ESCKEY, SPACEKEY)) {
|
||||
/* exit() ends the current stroke before cleaning up */
|
||||
|
@ -528,7 +528,7 @@ typedef enum eLattice_FlipAxes {
|
||||
LATTICE_FLIP_W = 2
|
||||
} eLattice_FlipAxes;
|
||||
|
||||
/* Flip midpoint value so that relative distances between midpoint and neighbour-pair is maintained
|
||||
/* Flip midpoint value so that relative distances between midpoint and neighbor-pair is maintained
|
||||
* ! Assumes that uvw <=> xyz (i.e. axis-aligned index-axes with coordinate-axes)
|
||||
* - Helper for lattice_flip_exec()
|
||||
*/
|
||||
|
@ -1444,7 +1444,7 @@ static void node_composit_buts_despeckle(uiLayout *layout, bContext *UNUSED(C),
|
||||
|
||||
col = uiLayoutColumn(layout, FALSE);
|
||||
uiItemR(col, ptr, "threshold", 0, NULL, ICON_NONE);
|
||||
uiItemR(col, ptr, "threshold_neighbour", 0, NULL, ICON_NONE);
|
||||
uiItemR(col, ptr, "threshold_neighbor", 0, NULL, ICON_NONE);
|
||||
}
|
||||
|
||||
static void node_composit_buts_diff_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
|
||||
|
@ -821,7 +821,7 @@ static Sequence *cut_seq_soft(Scene *scene, Sequence *seq, int cutframe)
|
||||
/* like duplicate, but only duplicate and cut overlapping strips,
|
||||
* strips to the left of the cutframe are ignored and strips to the right
|
||||
* are moved to the end of slist
|
||||
* we have to work on the same slist (not using a seperate list), since
|
||||
* we have to work on the same slist (not using a separate list), since
|
||||
* otherwise dupli_seq can't check for duplicate names properly and
|
||||
* may generate strips with the same name (which will mess up animdata)
|
||||
*/
|
||||
|
@ -261,7 +261,7 @@ public:
|
||||
/*! inserts a convex polygon occluder
|
||||
* This method is quite coarse insofar as it adds all cells intersecting the polygon bounding box
|
||||
* convex_poly
|
||||
* The list of 3D points constituing a convex polygon
|
||||
* The list of 3D points constituting a convex polygon
|
||||
*/
|
||||
void insertOccluder(Polygon3r *convex_poly);
|
||||
|
||||
|
@ -167,7 +167,7 @@ static PyObject *FrsCurve_is_empty_get(BPy_FrsCurve *self, void *UNUSED(closure)
|
||||
}
|
||||
|
||||
PyDoc_STRVAR(FrsCurve_segments_size_doc,
|
||||
"The number of segments in the polyline constituing the Curve.\n"
|
||||
"The number of segments in the polyline constituting the Curve.\n"
|
||||
"\n"
|
||||
":type: int");
|
||||
|
||||
|
@ -283,7 +283,7 @@ static PyObject *Stroke_stroke_vertices_end(BPy_Stroke *self)
|
||||
PyDoc_STRVAR(Stroke_stroke_vertices_size_doc,
|
||||
".. method:: stroke_vertices_size()\n"
|
||||
"\n"
|
||||
" Returns the number of StrokeVertex constituing the Stroke.\n"
|
||||
" Returns the number of StrokeVertex constituting the Stroke.\n"
|
||||
"\n"
|
||||
" :return: The number of stroke vertices.\n"
|
||||
" :rtype: int");
|
||||
|
@ -491,7 +491,7 @@ public:
|
||||
return _Id;
|
||||
}
|
||||
|
||||
/*! Returns the number of segments in the polyline constituing the Curve. */
|
||||
/*! Returns the number of segments in the polyline constituting the Curve. */
|
||||
inline unsigned int nSegments() const
|
||||
{
|
||||
return _nSegments;
|
||||
|
@ -774,7 +774,7 @@ public:
|
||||
const_vertex_iterator vertices_end() const;
|
||||
vertex_iterator vertices_end();
|
||||
|
||||
/*! Returns a StrokeVertexIterator pointing on the first StrokeVertex of the Stroke. One can specifly a sampling
|
||||
/*! Returns a StrokeVertexIterator pointing on the first StrokeVertex of the Stroke. One can specify a sampling
|
||||
* value to resample the Stroke on the fly if needed.
|
||||
* \param t
|
||||
* The resampling value with which we want our Stroke to be resampled.
|
||||
@ -785,7 +785,7 @@ public:
|
||||
/*! Returns a StrokeVertexIterator pointing after the last StrokeVertex of the Stroke. */
|
||||
StrokeInternal::StrokeVertexIterator strokeVerticesEnd();
|
||||
|
||||
/*! Returns the number of StrokeVertex constituing the Stroke. */
|
||||
/*! Returns the number of StrokeVertex constituting the Stroke. */
|
||||
inline unsigned int strokeVerticesSize() const
|
||||
{
|
||||
return _Vertices.size();
|
||||
|
@ -92,13 +92,13 @@ public:
|
||||
return _second;
|
||||
}
|
||||
|
||||
/*! Sets the first number constituing the Id */
|
||||
/*! Sets the first number constituting the Id */
|
||||
void setFirst(id_type first)
|
||||
{
|
||||
_first = first;
|
||||
}
|
||||
|
||||
/*! Sets the second number constituing the Id */
|
||||
/*! Sets the second number constituting the Id */
|
||||
void setSecond(id_type second)
|
||||
{
|
||||
_second = second;
|
||||
|
@ -23,7 +23,7 @@
|
||||
|
||||
/** \file blender/freestyle/intern/system/TimeUtils.h
|
||||
* \ingroup freestyle
|
||||
* \brief Class to measure ellapsed time
|
||||
* \brief Class to measure elapsed time
|
||||
* \author Stephane Grabli
|
||||
* \date 10/04/2002
|
||||
*/
|
||||
|
@ -95,7 +95,7 @@ public:
|
||||
|
||||
/*! Builds _nbOrientations+1 pyramids of images from the _nbOrientations+1 base images of the steerable viewmap.
|
||||
* \param steerableBases
|
||||
* The _nbOrientations+1 images constituing the basis for the steerable pyramid.
|
||||
* The _nbOrientations+1 images constituting the basis for the steerable pyramid.
|
||||
* \param copy
|
||||
* If false, the data is not duplicated, and Canvas deals with the memory management of these
|
||||
* _nbOrientations+1 images. If true, data is copied, and it's up to the caller to delete the images.
|
||||
|
@ -1352,12 +1352,12 @@ public:
|
||||
vertex_iterator vertices_end();
|
||||
|
||||
// Iterator access (Interface1D)
|
||||
/*! Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge.
|
||||
/*! Returns an Interface0DIterator to iterate over the SVertex constituting the embedding of this ViewEdge.
|
||||
* The returned Interface0DIterator points to the first SVertex of the ViewEdge.
|
||||
*/
|
||||
virtual Interface0DIterator verticesBegin();
|
||||
|
||||
/*! Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge.
|
||||
/*! Returns an Interface0DIterator to iterate over the SVertex constituting the embedding of this ViewEdge.
|
||||
* The returned Interface0DIterator points after the last SVertex of the ViewEdge.
|
||||
*/
|
||||
virtual Interface0DIterator verticesEnd();
|
||||
|
@ -4346,7 +4346,7 @@ static void def_cmp_despeckle(StructRNA *srna)
|
||||
RNA_def_property_ui_text(prop, "Threshold", "Threshold for detecting pixels to despeckle");
|
||||
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
|
||||
|
||||
prop = RNA_def_property(srna, "threshold_neighbour", PROP_FLOAT, PROP_NONE);
|
||||
prop = RNA_def_property(srna, "threshold_neighbor", PROP_FLOAT, PROP_NONE);
|
||||
RNA_def_property_float_sdna(prop, NULL, "custom4");
|
||||
RNA_def_property_range(prop, 0.0, 1.0f);
|
||||
RNA_def_property_ui_text(prop, "Neighbor", "Threshold for the number of neighbor pixels that must match");
|
||||
|
@ -159,7 +159,7 @@ EnumPropertyItem snap_uv_element_items[] = {
|
||||
};
|
||||
|
||||
/* workaround for duplicate enums,
|
||||
* have each enum line as a defne then conditionally set it or not
|
||||
* have each enum line as a define then conditionally set it or not
|
||||
*/
|
||||
|
||||
#define R_IMF_ENUM_BMP {R_IMF_IMTYPE_BMP, "BMP", ICON_FILE_IMAGE, "BMP", "Output image in bitmap format"},
|
||||
|
@ -50,7 +50,7 @@ static PyStructSequence_Field app_cb_info_fields[] = {
|
||||
{(char *)"render_post", (char *)"Callback list - on render (after)"},
|
||||
{(char *)"render_stats", (char *)"Callback list - on printing render statistics"},
|
||||
{(char *)"render_complete", (char *)"Callback list - on completion of render job"},
|
||||
{(char *)"render_cancel", (char *)"Callback list - on cancelling a render job"},
|
||||
{(char *)"render_cancel", (char *)"Callback list - on canceling a render job"},
|
||||
{(char *)"load_pre", (char *)"Callback list - on loading a new blend file (before)"},
|
||||
{(char *)"load_post", (char *)"Callback list - on loading a new blend file (after)"},
|
||||
{(char *)"save_pre", (char *)"Callback list - on saving a blend file (before)"},
|
||||
|
@ -1684,7 +1684,7 @@ static void add_freestyle(Render *re, int render)
|
||||
* real bmain uses. This is needed because freestyle's
|
||||
* bmain could be used to tag scenes for update, which
|
||||
* implies call of ED_render_scene_update in some cases
|
||||
* and that function requires proper windoew manager
|
||||
* and that function requires proper window manager
|
||||
* to present (sergey)
|
||||
*/
|
||||
re->freestyle_bmain.wm = re->main->wm;
|
||||
|
Loading…
Reference in New Issue
Block a user