Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-07-22 02:58:08 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-22 02:58:08 +0400
commit9b515033071b40e982ef647ee225e8afc377e0c9 (patch)
treeb8906cf9d21d2441c6dd0db1b518561def3f8f1a /source/gameengine/SceneGraph
parent049dd8a0ffa94b0d02033877ec99172659b89d8c (diff)
style cleanup
Diffstat (limited to 'source/gameengine/SceneGraph')
-rw-r--r--source/gameengine/SceneGraph/SG_BBox.cpp12
-rw-r--r--source/gameengine/SceneGraph/SG_Spatial.cpp6
-rw-r--r--source/gameengine/SceneGraph/SG_Tree.cpp3
3 files changed, 13 insertions, 8 deletions
diff --git a/source/gameengine/SceneGraph/SG_BBox.cpp b/source/gameengine/SceneGraph/SG_BBox.cpp
index 4b2fc5410fa..3911babd2b5 100644
--- a/source/gameengine/SceneGraph/SG_BBox.cpp
+++ b/source/gameengine/SceneGraph/SG_BBox.cpp
@@ -217,7 +217,8 @@ void SG_BBox::split(SG_BBox &left, SG_BBox &right) const
right.m_min[2] = m_min[2];
right.m_max = m_max;
std::cout << "splity" << std::endl;
- } else {
+ }
+ else {
left.m_min = m_min;
left.m_max[0] = m_max[0];
left.m_max[1] = m_max[1];
@@ -229,9 +230,9 @@ void SG_BBox::split(SG_BBox &left, SG_BBox &right) const
right.m_max = m_max;
std::cout << "splitz" << std::endl;
}
- } else {
- if (sizex > sizez)
- {
+ }
+ else {
+ if (sizex > sizez) {
left.m_min = m_min;
left.m_max[0] = m_min[0] + sizex/2.0;
left.m_max[1] = m_max[1];
@@ -242,7 +243,8 @@ void SG_BBox::split(SG_BBox &left, SG_BBox &right) const
right.m_min[2] = m_min[2];
right.m_max = m_max;
std::cout << "splitx" << std::endl;
- } else {
+ }
+ else {
left.m_min = m_min;
left.m_max[0] = m_max[0];
left.m_max[1] = m_max[1];
diff --git a/source/gameengine/SceneGraph/SG_Spatial.cpp b/source/gameengine/SceneGraph/SG_Spatial.cpp
index e026419ca67..f8c4b5165ee 100644
--- a/source/gameengine/SceneGraph/SG_Spatial.cpp
+++ b/source/gameengine/SceneGraph/SG_Spatial.cpp
@@ -151,10 +151,12 @@ RelativeTranslate(
) {
if (local) {
m_localPosition += m_localRotation * trans;
- } else {
+ }
+ else {
if (parent) {
m_localPosition += trans * parent->GetWorldOrientation();
- } else {
+ }
+ else {
m_localPosition += trans;
}
}
diff --git a/source/gameengine/SceneGraph/SG_Tree.cpp b/source/gameengine/SceneGraph/SG_Tree.cpp
index 738c0fdef22..0f8264985de 100644
--- a/source/gameengine/SceneGraph/SG_Tree.cpp
+++ b/source/gameengine/SceneGraph/SG_Tree.cpp
@@ -296,7 +296,8 @@ SG_Tree* SG_TreeFactory::MakeTreeDown(SG_BBox &bbox)
{
lefttree.Add(*it);
hasleft++;
- } else {
+ }
+ else {
righttree.Add(*it);
hasright++;
}