archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: indentation

Browse Source
This commit is contained in:
Campbell Barton
2015-03-11 13:14:24 +11:00
parent 0d053158ec
commit 6b610500b9
11 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -3206,7 +3206,8 @@ static void navmesh_drawColored(DerivedMesh *dm)
#endif
glDisable(GL_LIGHTING);
/* if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high priority - campbell */
/* if (GPU_buffer_legacy(dm) ) */ /* TODO - VBO draw code, not high priority - campbell */
{
DEBUG_VBO("Using legacy code. drawNavMeshColored\n");
//glShadeModel(GL_SMOOTH);
glBegin(glmode = GL_QUADS);

18
source/blender/blenkernel/intern/cloth.c
View File

@@ -780,17 +780,15 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm )
}
}
if (clmd->sim_parms->vgroup_shrink > 0 )
{
if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink-1))
{
verts->shrink_factor = clmd->sim_parms->shrink_min*(1.0f-dvert->dw[j].weight)+clmd->sim_parms->shrink_max*dvert->dw [j].weight; // linear interpolation between min and max shrink factor based on weight
if (clmd->sim_parms->vgroup_shrink > 0) {
if (dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink - 1)) {
/* linear interpolation between min and max shrink factor based on weight */
verts->shrink_factor = clmd->sim_parms->shrink_min * (1.0f - dvert->dw[j].weight) + clmd->sim_parms->shrink_max * dvert->dw [j].weight;
}
}
else {
verts->shrink_factor = clmd->sim_parms->shrink_min;
}
}
else {
verts->shrink_factor = clmd->sim_parms->shrink_min;
}
}
}
}

2
source/blender/blenkernel/intern/effect.c
View File

@@ -231,7 +231,7 @@ ListBase *pdInitEffectors(Scene *scene, Object *ob_src, ParticleSystem *psys_src
for (base = scene->base.first; base; base= base->next) {
if ( (base->lay & layer) ) {
if ( base->object->pd && base->object->pd->forcefield )
add_object_to_effectors(&effectors, scene, weights, base->object, ob_src);
add_object_to_effectors(&effectors, scene, weights, base->object, ob_src);
if ( base->object->particlesystem.first ) {
ParticleSystem *psys= base->object->particlesystem.first;

8
source/blender/blenkernel/intern/softbody.c
View File

@@ -522,10 +522,8 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M)
mima->maxz = max_ff(mima->maxz, v[2] + hull);
}
mima++;
mface++;
mima++;
mface++;
}
return;
}
@@ -707,7 +705,7 @@ static void add_2nd_order_roller(Object *ob, float UNUSED(stiffness), int *count
}
}
if ((bs2->v2 !=notthis)&&(bs2->v2 > v0)) {
(*counter)++;/*hit */
(*counter)++; /* hit */
if (addsprings) {
bs3->v1= v0;
bs3->v2= bs2->v2;

31
source/blender/blenloader/intern/readfile.c
View File

@@ -3767,25 +3767,26 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
BoidRule *rule;
for (; state; state=state->next) {
rule = state->rules.first;
for (; rule; rule=rule->next)
switch (rule->type) {
case eBoidRuleType_Goal:
case eBoidRuleType_Avoid:
{
BoidRuleGoalAvoid *brga = (BoidRuleGoalAvoid*)rule;
brga->ob = newlibadr(fd, part->id.lib, brga->ob);
break;
}
case eBoidRuleType_FollowLeader:
{
BoidRuleFollowLeader *brfl = (BoidRuleFollowLeader*)rule;
brfl->ob = newlibadr(fd, part->id.lib, brfl->ob);
break;
for (; rule; rule=rule->next) {
switch (rule->type) {
case eBoidRuleType_Goal:
case eBoidRuleType_Avoid:
{
BoidRuleGoalAvoid *brga = (BoidRuleGoalAvoid*)rule;
brga->ob = newlibadr(fd, part->id.lib, brga->ob);
break;
}
case eBoidRuleType_FollowLeader:
{
BoidRuleFollowLeader *brfl = (BoidRuleFollowLeader*)rule;
brfl->ob = newlibadr(fd, part->id.lib, brfl->ob);
break;
}
}
}
}
}
for (a = 0; a < MAX_MTEX; a++) {
mtex= part->mtex[a];
if (mtex) {

2
source/blender/bmesh/operators/bmo_normals.c
View File

@@ -71,7 +71,7 @@ static bool bmo_recalc_normal_edge_filter_cb(BMElem *ele, void *UNUSED(user_data
*
* To take these spikes into account, use the normals of the faces edges.
*/
#define USE_FACE_EDGE_NORMAL_TEST
#define USE_FACE_EDGE_NORMAL_TEST
/**
* The center of the entire island is't necessarily well placed,

2
source/blender/editors/object/object_edit.c
View File

@@ -2063,4 +2063,4 @@ bool ED_object_editmode_calc_active_center(Object *obedit, const bool select_onl
}
return false;
}
}

1
source/blender/editors/space_clip/tracking_select.c
View File

@@ -62,7 +62,6 @@ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]);
static int mouse_on_side(float co[2], float x1, float y1, float x2, float y2, float epsx, float epsy)
{
if (x1 > x2)
SWAP(float, x1, x2);
if (y1 > y2)

8
source/blender/editors/space_view3d/space_view3d.c
View File

@@ -420,10 +420,10 @@ static void view3d_free(SpaceLink *sl)
MEM_freeN(vd->defmaterial);
}
if (vd->fx_settings.ssao)
MEM_freeN(vd->fx_settings.ssao);
if (vd->fx_settings.dof)
MEM_freeN(vd->fx_settings.dof);
if (vd->fx_settings.ssao)
MEM_freeN(vd->fx_settings.ssao);
if (vd->fx_settings.dof)
MEM_freeN(vd->fx_settings.dof);
}

6
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -4326,9 +4326,9 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
float delta[2], ret = OPERATOR_RUNNING_MODAL;
bool snap;
float angle_precision = 0.0f;
const bool has_numInput = hasNumInput(&rc->num_input);
bool handled = false;
float numValue;
const bool has_numInput = hasNumInput(&rc->num_input);
bool handled = false;
float numValue;
/* TODO: fix hardcoded events */
snap = event->ctrl != 0;

3
source/blender/windowmanager/intern/wm_window.c
View File

@@ -364,7 +364,8 @@ static void wm_window_add_ghostwindow(wmWindowManager *wm, const char *title, wm
* mix it, either all windows have it, or none (tested in OSX opengl) */
if (multisamples == -1)
multisamples = U.ogl_multisamples;
glSettings.numOfAASamples = multisamples;
glSettings.numOfAASamples = multisamples;
if (!(U.uiflag2 & USER_OPENGL_NO_WARN_SUPPORT))
glSettings.flags |= GHOST_glWarnSupport;