[Bf-blender-cvs] [44384c6] master: BGe: Fix T45597 wrong object layer for linked object in blenderplayer.
Porteries Tristan
noreply at git.blender.org
Thu Aug 6 17:18:46 CEST 2015
Commit: 44384c698d394f6e7ed17b61e8406c867488aef9
Author: Porteries Tristan
Date: Thu Aug 6 16:58:52 2015 +0200
Branches: master
https://developer.blender.org/rB44384c698d394f6e7ed17b61e8406c867488aef9
BGe: Fix T45597 wrong object layer for linked object in blenderplayer.
===================================================================
M source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index b6bf960..2de3ea0 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -1720,6 +1720,18 @@ static void UNUSED_FUNCTION(print_active_constraints2)(Object *ob) //not used, u
}
}
+// Copy base layer to object layer like in BKE_scene_set_background
+static void blenderSceneSetBackground(Scene *blenderscene)
+{
+ Scene *it;
+ Base *base;
+
+ for (SETLOOPER(blenderscene, it, base)) {
+ base->object->lay = base->lay;
+ base->object->flag = base->flag;
+ }
+}
+
static KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist)
{
@@ -1972,6 +1984,9 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
}
SetDefaultLightMode(blenderscene);
+
+ blenderSceneSetBackground(blenderscene);
+
// Let's support scene set.
// Beware of name conflict in linked data, it will not crash but will create confusion
// in Python scripting and in certain actuators (replace mesh). Linked scene *should* have
More information about the Bf-blender-cvs
mailing list