forked from bartvdbraak/blender
style cleanup: some warnigs & spelling.
This commit is contained in:
parent
8b1fb0fd2a
commit
296444e1dc
@ -552,7 +552,7 @@ void Session::run_cpu()
|
||||
}
|
||||
else if(need_tonemap) {
|
||||
/* tonemap only if we do not reset, we don't we don't
|
||||
* wan't to show the result of an incomplete sample*/
|
||||
* want to show the result of an incomplete sample*/
|
||||
tonemap();
|
||||
}
|
||||
|
||||
|
@ -656,7 +656,7 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf
|
||||
* available. my ussual 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 anycase, a better solution is needed to prevent
|
||||
* In any case, a better solution is needed to prevent
|
||||
* inconsistency. */
|
||||
|
||||
void BKE_brush_size_set(Scene *scene, Brush *brush, int size)
|
||||
|
@ -759,7 +759,7 @@ static ModifierData *curve_get_tessellate_point(Scene *scene, Object *ob, int fo
|
||||
|
||||
/* this modifiers are moving point of tessellation automatically
|
||||
* (some of them even can't be applied on tessellated curve), set flag
|
||||
* for incformation button in modifier's header
|
||||
* for information button in modifier's header
|
||||
*/
|
||||
md->mode |= eModifierMode_ApplyOnSpline;
|
||||
}
|
||||
|
@ -248,6 +248,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *em)
|
||||
|
||||
totfilltri = BLI_scanfill_calc_ex(&sf_ctx, 0, efa->no);
|
||||
BLI_assert(totfilltri <= efa->len - 2);
|
||||
(void)totfilltri;
|
||||
|
||||
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next) {
|
||||
BMLoop **l_ptr = looptris[i++];
|
||||
|
@ -2579,6 +2579,7 @@ int BKE_mesh_recalc_tessellation(CustomData *fdata,
|
||||
|
||||
totfilltri = BLI_scanfill_calc(&sf_ctx, 0);
|
||||
BLI_assert(totfilltri <= mp->totloop - 2);
|
||||
(void)totfilltri;
|
||||
|
||||
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next, mf++) {
|
||||
mface_to_poly_map[mface_index] = poly_index;
|
||||
|
@ -1447,9 +1447,9 @@ void BKE_nla_validate_state(AnimData *adt)
|
||||
if (strip->extendmode != NLASTRIP_EXTEND_NOTHING) {
|
||||
/* 1) First strip must be set to extend hold, otherwise, stuff before acts dodgy
|
||||
* 2) Only overwrite extend mode if *not* changing it will most probably result in
|
||||
* occlusion problems, which will occur iff
|
||||
* - blendmode = REPLACE
|
||||
* - all channels the same (this is fiddly to test, so is currently assumed)
|
||||
* occlusion problems, which will occur if...
|
||||
* - blendmode = REPLACE
|
||||
* - all channels the same (this is fiddly to test, so is currently assumed)
|
||||
*
|
||||
* Should fix problems such as [#29869]
|
||||
*/
|
||||
|
@ -1275,7 +1275,7 @@ void BKE_ptcache_ids_from_object(ListBase *lb, Object *ob, Scene *scene, int dup
|
||||
if (scene && (duplis-- > 0) && (ob->transflag & OB_DUPLI)) {
|
||||
ListBase *lb_dupli_ob;
|
||||
|
||||
/* don't update the dupli groups, we only wan't their pid's */
|
||||
/* don't update the dupli groups, we only want their pid's */
|
||||
if ((lb_dupli_ob = object_duplilist_ex(scene, ob, FALSE, FALSE))) {
|
||||
DupliObject *dob;
|
||||
for (dob= lb_dupli_ob->first; dob; dob= dob->next) {
|
||||
|
@ -354,7 +354,7 @@ void BKE_rigidbody_validate_sim_shape(Object *ob, short rebuild)
|
||||
/* if automatically determining dimensions, use the Object's boundbox
|
||||
* - assume that all quadrics are standing upright on local z-axis
|
||||
* - assume even distribution of mass around the Object's pivot
|
||||
* (i.e. Object pivot is centralised in boundbox)
|
||||
* (i.e. Object pivot is centralized in boundbox)
|
||||
*/
|
||||
// XXX: all dimensions are auto-determined now... later can add stored settings for this
|
||||
/* get object dimensions without scaling */
|
||||
|
@ -716,7 +716,7 @@ void BKE_scene_unlink(Main *bmain, Scene *sce, Scene *newsce)
|
||||
}
|
||||
|
||||
/* used by metaballs
|
||||
* doesnt return the original duplicated object, only dupli's
|
||||
* doesn't return the original duplicated object, only dupli's
|
||||
*/
|
||||
int BKE_scene_base_iter_next(Scene **scene, int val, Base **base, Object **ob)
|
||||
{
|
||||
|
@ -245,7 +245,7 @@ void BM_mesh_free(BMesh *bm)
|
||||
BM_mesh_data_free(bm);
|
||||
|
||||
if (bm->py_handle) {
|
||||
/* keep this out of 'BM_mesh_data_free' because we wan't python
|
||||
/* keep this out of 'BM_mesh_data_free' because we want python
|
||||
* to be able to clear the mesh and maintain access. */
|
||||
extern void bpy_bm_generic_invalidate(void *self);
|
||||
|
||||
|
@ -48,7 +48,8 @@ void TranslateNode::convertToOperations(ExecutionSystem *graph, CompositorContex
|
||||
inputSocket->relinkConnections(wrapOperation->getInputSocket(0), 0, graph);
|
||||
addLink(graph, wrapOperation->getOutputSocket(), operation->getInputSocket(0));
|
||||
graph->addOperation(wrapOperation);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
|
||||
}
|
||||
|
||||
|
@ -6973,7 +6973,7 @@ static int ui_handle_menus_recursive(bContext *C, const wmEvent *event, uiPopupB
|
||||
retval = ui_handle_menu_return_submenu(C, event, menu);
|
||||
submenu = NULL; /* hint not to use this, it may be freed by call above */
|
||||
(void)submenu;
|
||||
/* we may wan't to quit the submenu and handle the even in this menu,
|
||||
/* we may want to quit the submenu and handle the even in this menu,
|
||||
* if its important to use it, check 'data->menu' first */
|
||||
if ((retval == WM_UI_HANDLER_BREAK) && do_ret_out_parent) {
|
||||
retval = ui_handle_menu_event(C, event, menu, level);
|
||||
|
@ -360,7 +360,7 @@ int ED_operator_editarmature(bContext *C)
|
||||
/**
|
||||
* \brief check for pose mode (no mixed modes)
|
||||
*
|
||||
* We wan't to enable most pose operations in weight paint mode,
|
||||
* We want to enable most pose operations in weight paint mode,
|
||||
* when it comes to transforming bones, but managing bomes layers/groups
|
||||
* can be left for pose mode only. (not weight paint mode)
|
||||
*/
|
||||
|
@ -95,7 +95,7 @@ FileSelectParams *ED_fileselect_get_params(struct SpaceFile *sfile)
|
||||
}
|
||||
|
||||
/**
|
||||
* \note RNA_struct_property_is_set_ex is used here because we wan't
|
||||
* \note RNA_struct_property_is_set_ex is used here because we want
|
||||
* the previously used settings to be used here rather then overriding them */
|
||||
short ED_fileselect_set_params(SpaceFile *sfile)
|
||||
{
|
||||
|
@ -318,9 +318,9 @@ void RNA_api_image(StructRNA *srna)
|
||||
RNA_def_function_ui_description(func, "Delay the image from being cleaned from the cache due inactivity");
|
||||
RNA_def_function_flag(func, FUNC_USE_REPORTS);
|
||||
RNA_def_int(func, "filter", GL_LINEAR_MIPMAP_NEAREST, -INT_MAX, INT_MAX, "Filter",
|
||||
"The texture minifying function to use if the image wan't loaded", -INT_MAX, INT_MAX);
|
||||
"The texture minifying function to use if the image wasn't loaded", -INT_MAX, INT_MAX);
|
||||
RNA_def_int(func, "mag", GL_LINEAR, -INT_MAX, INT_MAX, "Magnification",
|
||||
"The texture magnification function to use if the image wan't loaded", -INT_MAX, INT_MAX);
|
||||
"The texture magnification function to use if the image wasn't loaded", -INT_MAX, INT_MAX);
|
||||
/* return value */
|
||||
parm = RNA_def_int(func, "error", 0, -INT_MAX, INT_MAX, "Error", "OpenGL error value", -INT_MAX, INT_MAX);
|
||||
RNA_def_function_return(func, parm);
|
||||
|
@ -332,7 +332,7 @@ void BPY_python_start(int argc, const char **argv)
|
||||
PyErr_Print();
|
||||
PyErr_Clear();
|
||||
}
|
||||
// Py_DECREF(mod); /* ideally would decref, but in this case we never wan't to free */
|
||||
// Py_DECREF(mod); /* ideally would decref, but in this case we never want to free */
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user