Commit: 6bde5381bb7c275cb9005babaf455bdc8ff62f4e
Author: Campbell Barton
Date: Thu Oct 2 10:32:59 2014 +0200
Branches: master
https://developer.blender.org/rB6bde5381bb7c275cb9005babaf455bdc8ff62f4e
Cleanup: indentation
===================================================================
M source/blender/makesrna/intern/rna_smoke.c
M source/creator/creator.c
M source/gameengine/Converter/BL_ArmatureObject.cpp
M source/gameengine/Ketsji/KX_KetsjiEngine.cpp
===================================================================
diff --git a/source/blender/makesrna/intern/rna_smoke.c
b/source/blender/makesrna/intern/rna_smoke.c
index 7f62e60..55262a9 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -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);
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 3511c9d..9d1ef49 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -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 */
diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp
b/source/gameengine/Converter/BL_ArmatureObject.cpp
index 8d73e59..e01130a 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -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);
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 14772cd..f76580c 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -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++;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
