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:
authorMitchell Stokes <mogurijin@gmail.com>2013-07-10 00:06:36 +0400
committerMitchell Stokes <mogurijin@gmail.com>2013-07-10 00:06:36 +0400
commit83e9f32382810437bf113fee3b5c32881d7e67ec (patch)
tree60d1a6aef4accf267053a521a6d21ad117d64eee /source/gameengine/Converter
parentf6502a67f203dbd57446f5b10cbdd82a4610e84c (diff)
BGE: Committing patch #32422 "Debug properties for added objects" by HG1.
This patch allows debug properties from objects added to the scene at runtime to be displayed under the Debug Properties in the overhead display.
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/KX_ConvertProperties.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp
index 7222c673322..3b4ba6886cb 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.cpp
+++ b/source/gameengine/Converter/KX_ConvertProperties.cpp
@@ -131,7 +131,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan
if (propval)
{
- if (show_debug_info)
+ if (show_debug_info && isInActiveLayer)
{
scene->AddDebugProperty(gameobj,STR_String(prop->name));
}
@@ -159,7 +159,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan
prop = prop->next;
}
// check if state needs to be debugged
- if (object->scaflag & OB_DEBUGSTATE)
+ if (object->scaflag & OB_DEBUGSTATE && isInActiveLayer)
{
// reserve name for object state
scene->AddDebugProperty(gameobj,STR_String("__state__"));