forked from bartvdbraak/blender
Cleanup: style
This commit is contained in:
parent
b1a92f2b3a
commit
fa823dc828
@ -1423,7 +1423,7 @@ void id_clear_lib_data(Main *bmain, ID *id)
|
||||
}
|
||||
|
||||
if (GS(id->name) == ID_OB) {
|
||||
Object *object = (Object*)id;
|
||||
Object *object = (Object *)id;
|
||||
if (object->proxy_from != NULL) {
|
||||
object->proxy_from->proxy = NULL;
|
||||
object->proxy_from->proxy_group = NULL;
|
||||
|
@ -2457,7 +2457,7 @@ BMVert *bmesh_urmv_loop(BMesh *bm, BMLoop *l_sep)
|
||||
/**
|
||||
* A version of #bmesh_urmv_loop that disconnects multiple loops at once.
|
||||
*
|
||||
* Handles the task of finding fans boundaris.
|
||||
* Handles the task of finding fans boundaries.
|
||||
*/
|
||||
BMVert *bmesh_urmv_loop_multi(
|
||||
BMesh *bm, BMLoop **larr, int larr_len)
|
||||
|
@ -64,7 +64,7 @@ MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, unsigned int chunkNumber, r
|
||||
this->m_num_channels = determine_num_channels(memoryProxy->getDataType());
|
||||
this->m_buffer = (float *)MEM_mallocN_aligned(sizeof(float) * determineBufferSize() * this->m_num_channels, 16, "COM_MemoryBuffer");
|
||||
this->m_state = COM_MB_ALLOCATED;
|
||||
this->m_datatype = memoryProxy->getDataType();;
|
||||
this->m_datatype = memoryProxy->getDataType();
|
||||
}
|
||||
|
||||
MemoryBuffer::MemoryBuffer(MemoryProxy *memoryProxy, rcti *rect)
|
||||
|
@ -426,9 +426,9 @@ void DepsgraphRelationBuilder::build_object(Main *bmain, Scene *scene, Object *o
|
||||
break;
|
||||
}
|
||||
|
||||
Key *key =BKE_key_from_object(ob);
|
||||
Key *key = BKE_key_from_object(ob);
|
||||
if (key != NULL) {
|
||||
ComponentKey geometry_key((ID*)ob->data, DEPSNODE_TYPE_GEOMETRY);
|
||||
ComponentKey geometry_key((ID *)ob->data, DEPSNODE_TYPE_GEOMETRY);
|
||||
ComponentKey key_key(&key->id, DEPSNODE_TYPE_GEOMETRY);
|
||||
add_relation(key_key, geometry_key, DEPSREL_TYPE_GEOMETRY_EVAL, "Shapekeys");
|
||||
}
|
||||
|
@ -369,7 +369,7 @@ void DEG_evaluate_on_refresh(EvaluationContext *eval_ctx,
|
||||
{
|
||||
/* Update time on primary timesource. */
|
||||
TimeSourceDepsNode *tsrc = graph->find_time_source();
|
||||
tsrc->cfra = BKE_scene_frame_get(scene);;
|
||||
tsrc->cfra = BKE_scene_frame_get(scene);
|
||||
|
||||
DEG_evaluate_on_refresh_ex(eval_ctx, graph, graph->layers);
|
||||
}
|
||||
|
@ -1814,8 +1814,8 @@ static int delete_key_button_exec(bContext *C, wmOperator *op)
|
||||
|
||||
if (BKE_fcurve_is_protected(fcu)) {
|
||||
BKE_reportf(op->reports, RPT_WARNING,
|
||||
"Not deleting keyframe for locked F-Curve for NLA Strip influence on %s - %s '%s'",
|
||||
strip->name, BKE_idcode_to_name(GS(id->name)), id->name + 2);
|
||||
"Not deleting keyframe for locked F-Curve for NLA Strip influence on %s - %s '%s'",
|
||||
strip->name, BKE_idcode_to_name(GS(id->name)), id->name + 2);
|
||||
}
|
||||
else {
|
||||
/* remove the keyframe directly
|
||||
|
@ -1637,7 +1637,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle)
|
||||
}
|
||||
|
||||
/**
|
||||
* Called for creatign new popups and refreshing existing ones.
|
||||
* Called for creating new popups and refreshing existing ones.
|
||||
*/
|
||||
uiBlock *ui_popup_block_refresh(
|
||||
bContext *C, uiPopupBlockHandle *handle,
|
||||
|
@ -409,7 +409,7 @@ bool ED_mask_selected_minmax(const bContext *C, float min[2], float max[2])
|
||||
mask_layer = mask_layer->next)
|
||||
{
|
||||
MaskSpline *spline;
|
||||
if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW|MASK_RESTRICT_SELECT)) {
|
||||
if (mask_layer->restrictflag & (MASK_RESTRICT_VIEW | MASK_RESTRICT_SELECT)) {
|
||||
continue;
|
||||
}
|
||||
for (spline = mask_layer->splines.first;
|
||||
|
@ -395,7 +395,7 @@ static Image *imapaint_face_image(Object *ob, Mesh *me, int face_index)
|
||||
{
|
||||
Image *ima;
|
||||
MPoly *mp = me->mpoly + face_index;
|
||||
Material *ma = give_current_material(ob, mp->mat_nr + 1);;
|
||||
Material *ma = give_current_material(ob, mp->mat_nr + 1);
|
||||
ima = ma && ma->texpaintslot ? ma->texpaintslot[ma->paint_active_slot].ima : NULL;
|
||||
|
||||
return ima;
|
||||
|
@ -483,17 +483,17 @@ static bool file_walk_select_selection_set(
|
||||
filelist_is_selected(files, active_old, FILE_SEL_SELECTED) &&
|
||||
filelist_is_selected(files, active_new, FILE_SEL_SELECTED))
|
||||
{
|
||||
/* conditions for deselecting: initial file is selected, new file is
|
||||
* selected and either other_side isn't selected/found or we use fill */
|
||||
deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
|
||||
/* conditions for deselecting: initial file is selected, new file is
|
||||
* selected and either other_side isn't selected/found or we use fill */
|
||||
deselect = (fill || other_site == -1 || !filelist_is_selected(files, other_site, FILE_SEL_SELECTED));
|
||||
|
||||
/* don't change active here since we either want to deselect active or we want to
|
||||
* walk through a block of selected files without selecting/deselecting anything */
|
||||
params->active_file = active_new;
|
||||
/* but we want to change active if we use fill (needed to get correct selection bounds) */
|
||||
if (deselect && fill) {
|
||||
active = active_new;
|
||||
}
|
||||
/* don't change active here since we either want to deselect active or we want to
|
||||
* walk through a block of selected files without selecting/deselecting anything */
|
||||
params->active_file = active_new;
|
||||
/* but we want to change active if we use fill (needed to get correct selection bounds) */
|
||||
if (deselect && fill) {
|
||||
active = active_new;
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* regular selection change */
|
||||
|
@ -226,7 +226,7 @@ static int strip_modifier_copy_exec(bContext *C, wmOperator *UNUSED(op))
|
||||
if (seq_iter->modifiers.first) {
|
||||
SequenceModifierData *smd_tmp, *smd = seq_iter->modifiers.first;
|
||||
|
||||
while(smd) {
|
||||
while (smd) {
|
||||
smd_tmp = smd->next;
|
||||
BLI_remlink(&seq_iter->modifiers, smd);
|
||||
BKE_sequence_modifier_free(smd);
|
||||
|
@ -1928,7 +1928,7 @@ char *rna_GPUDOF_path(PointerRNA *ptr)
|
||||
}
|
||||
}
|
||||
|
||||
return BLI_strdup("");;
|
||||
return BLI_strdup("");
|
||||
}
|
||||
|
||||
static void rna_GPUFXSettings_fx_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
|
||||
|
@ -859,7 +859,7 @@ static void cloth_collision_solve_extra(Object *ob, ClothModifierData *clmd, Lis
|
||||
Implicit_Data *id = cloth->implicit;
|
||||
ClothVertex *verts = cloth->verts;
|
||||
int numverts = cloth->numverts;
|
||||
const float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;;
|
||||
const float spf = (float)clmd->sim_parms->stepsPerFrame / clmd->sim_parms->timescale;
|
||||
|
||||
bool do_extra_solve;
|
||||
int i;
|
||||
|
@ -535,7 +535,7 @@ PyObject *BaseMathObject_freeze(BaseMathObject *self)
|
||||
|
||||
self->flag |= BASE_MATH_FLAG_IS_FROZEN;
|
||||
|
||||
return Py_INCREF_RET((PyObject *)self);;
|
||||
return Py_INCREF_RET((PyObject *)self);
|
||||
}
|
||||
|
||||
int BaseMathObject_traverse(BaseMathObject *self, visitproc visit, void *arg)
|
||||
|
@ -3072,7 +3072,7 @@ void CcdPhysicsEnvironment::ConvertObject(KX_GameObject *gameobj, RAS_MeshObject
|
||||
{
|
||||
Object* blenderobject = gameobj->GetBlenderObject();
|
||||
|
||||
bool isbulletdyna = (blenderobject->gameflag & OB_DYNAMIC) != 0;;
|
||||
bool isbulletdyna = (blenderobject->gameflag & OB_DYNAMIC) != 0;
|
||||
bool isbulletsensor = (blenderobject->gameflag & OB_SENSOR) != 0;
|
||||
bool isbulletchar = (blenderobject->gameflag & OB_CHARACTER) != 0;
|
||||
bool isbulletsoftbody = (blenderobject->gameflag & OB_SOFT_BODY) != 0;
|
||||
|
Loading…
Reference in New Issue
Block a user