griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: indentation

Browse Source
This commit is contained in:
Campbell Barton
2014-10-02 10:32:59 +02:00
parent 3dada2f8cf
commit 6bde5381bb
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_smoke.c
View 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);

4
source/creator/creator.c
View 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 */

2
source/gameengine/Converter/BL_ArmatureObject.cpp
View 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);

52
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
View 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++;
}