Cleanup: indentation
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Oct 2014 08:32:59 +0000 (10:32 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Oct 2014 08:33:15 +0000 (10:33 +0200)
source/blender/makesrna/intern/rna_smoke.c
source/creator/creator.c
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp

index 7f62e60f0718ad9b2f8e98db37dfc775983df109..55262a98b2e61aaa4fef2e43ad2ad3838ce986a4 100644 (file)
@@ -311,7 +311,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "resolution_max", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "maxres");
-    RNA_def_property_range(prop, 6, 512);
+       RNA_def_property_range(prop, 6, 512);
        RNA_def_property_ui_range(prop, 24, 512, 2, -1);
        RNA_def_property_ui_text(prop, "Max Res", "Maximal resolution used in the fluid domain");
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
index 3511c9dc2cbff2cbf4c2fec81a0dd4ac449fc3b3..9d1ef49d9697fae494c01d20fe67b613184e63b8 100644 (file)
@@ -1529,9 +1529,9 @@ int main(
 #endif
 
 #ifdef WIN32
-    /* FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM (fixed in SP1). Just disable it. */
+       /* FMA3 support in the 2013 CRT is broken on Vista and Windows 7 RTM (fixed in SP1). Just disable it. */
 #  if defined(_MSC_VER) && _MSC_VER >= 1800 && defined(_M_X64)
-    _set_FMA3_enable(0);
+       _set_FMA3_enable(0);
 #  endif
 
        /* Win32 Unicode Args */
index 8d73e591113b0006ee2e7b34d52dceb055a19b9a..e01130a89705b24adf8598148ed3b57eeedfbb31 100644 (file)
@@ -101,7 +101,7 @@ static void game_copy_pose(bPose **dst, bPose *src, int copy_constraint)
        out->chanhash = NULL;
        out->agroups.first= out->agroups.last= NULL;
        out->ikdata = NULL;
-    out->ikparam = MEM_dupallocN(src->ikparam);
+       out->ikparam = MEM_dupallocN(src->ikparam);
        out->flag |= POSE_GAME_ENGINE;
        BLI_duplicatelist(&out->chanbase, &src->chanbase);
 
index 14772cda11385e9e60def49ea57c2abbf5ee5d45..f76580cd44d713e0b8df4dee03291067c4179fdd 100644 (file)
@@ -1734,18 +1734,17 @@ void KX_KetsjiEngine::AddScheduledScenes()
 
 bool KX_KetsjiEngine::ReplaceScene(const STR_String& oldscene,const STR_String& newscene)
 {
-    // Don't allow replacement if the new scene doesn't exists.
-    // Allows smarter game design (used to have no check here).
-    // Note that it creates a small backward compatbility issue
-    // for a game that did a replace followed by a lib load with the
-    // new scene in the lib => it won't work anymore, the lib
-    // must be loaded before doing the replace.
-    if (m_sceneconverter->GetBlenderSceneForName(newscene) != NULL)
-    {
-        m_replace_scenes.push_back(std::make_pair(oldscene,newscene));
-        return true;
-    }
-    return false;
+       // Don't allow replacement if the new scene doesn't exists.
+       // Allows smarter game design (used to have no check here).
+       // Note that it creates a small backward compatbility issue
+       // for a game that did a replace followed by a lib load with the
+       // new scene in the lib => it won't work anymore, the lib
+       // must be loaded before doing the replace.
+       if (m_sceneconverter->GetBlenderSceneForName(newscene) != NULL) {
+               m_replace_scenes.push_back(std::make_pair(oldscene,newscene));
+               return true;
+       }
+       return false;
 }
 
 // replace scene is not the same as removing and adding because the
@@ -1767,21 +1766,20 @@ void KX_KetsjiEngine::ReplaceScheduledScenes()
                        int i=0;
                        /* Scenes are not supposed to be included twice... I think */
                        KX_SceneList::iterator sceneit;
-                       for (sceneit = m_scenes.begin();sceneit != m_scenes.end() ; sceneit++)
-                       {
-                KX_Scene* scene = *sceneit;
-                               if (scene->GetName() == oldscenename)
-                               {
-                    // avoid crash if the new scene doesn't exist, just do nothing
-                    Scene *blScene = m_sceneconverter->GetBlenderSceneForName(newscenename);
-                    if (blScene) {
-                        m_sceneconverter->RemoveScene(scene);
-                        KX_Scene* tmpscene = CreateScene(blScene);
-                        m_scenes[i]=tmpscene;
-                        PostProcessScene(tmpscene);
-                    } else {
-                        printf("warning: scene %s could not be found, not replaced!\n",newscenename.ReadPtr());
-                    }
+                       for (sceneit = m_scenes.begin();sceneit != m_scenes.end() ; sceneit++) {
+                               KX_Scene* scene = *sceneit;
+                               if (scene->GetName() == oldscenename) {
+                                       // avoid crash if the new scene doesn't exist, just do nothing
+                                       Scene *blScene = m_sceneconverter->GetBlenderSceneForName(newscenename);
+                                       if (blScene) {
+                                               m_sceneconverter->RemoveScene(scene);
+                                               KX_Scene* tmpscene = CreateScene(blScene);
+                                               m_scenes[i]=tmpscene;
+                                               PostProcessScene(tmpscene);
+                                       }
+                                       else {
+                                               printf("warning: scene %s could not be found, not replaced!\n",newscenename.ReadPtr());
+                                       }
                                }
                                i++;
                        }