Commit: 6b610500b99d8e6ac2950d7702f669b9fa1192fe
Author: Campbell Barton
Date: Wed Mar 11 13:14:24 2015 +1100
Branches: master
https://developer.blender.org/rB6b610500b99d8e6ac2950d7702f669b9fa1192fe
Cleanup: indentation
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cloth.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenloader/intern/readfile.c
M source/blender/bmesh/operators/bmo_normals.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/space_clip/tracking_select.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c
b/source/blender/blenkernel/intern/DerivedMesh.c
index 51f17f7..870b020 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -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);
diff --git a/source/blender/blenkernel/intern/cloth.c
b/source/blender/blenkernel/intern/cloth.c
index 3173489..3b3fe32 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -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;
- }
-
}
}
}
diff --git a/source/blender/blenkernel/intern/effect.c
b/source/blender/blenkernel/intern/effect.c
index 76a39fe..296a56a 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -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;
diff --git a/source/blender/blenkernel/intern/softbody.c
b/source/blender/blenkernel/intern/softbody.c
index 06d0627..3cc2337 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -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;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 45d1c20..b46658f 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -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) {
diff --git a/source/blender/bmesh/operators/bmo_normals.c
b/source/blender/bmesh/operators/bmo_normals.c
index 0ef9655..f62e445 100644
--- a/source/blender/bmesh/operators/bmo_normals.c
+++ b/source/blender/bmesh/operators/bmo_normals.c
@@ -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,
diff --git a/source/blender/editors/object/object_edit.c
b/source/blender/editors/object/object_edit.c
index 458feeb..e14b303 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -2063,4 +2063,4 @@ bool ED_object_editmode_calc_active_center(Object
*obedit, const bool select_onl
}
return false;
-}
\ No newline at end of file
+}
diff --git a/source/blender/editors/space_clip/tracking_select.c
b/source/blender/editors/space_clip/tracking_select.c
index bc6ac50..0b29c25 100644
--- a/source/blender/editors/space_clip/tracking_select.c
+++ b/source/blender/editors/space_clip/tracking_select.c
@@ -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)
diff --git a/source/blender/editors/space_view3d/space_view3d.c
b/source/blender/editors/space_view3d/space_view3d.c
index 1112f2e..35fb2bc 100644
--- a/source/blender/editors/space_view3d/space_view3d.c
+++ b/source/blender/editors/space_view3d/space_view3d.c
@@ -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);
}
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 1dc719d..5d0c5d4 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -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;
diff --git a/source/blender/windowmanager/intern/wm_window.c
b/source/blender/windowmanager/intern/wm_window.c
index e341e49..4f7e5ab 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
