Merging r38454 through r38515 from trunk into soc-2011-tomato
[blender.git] / source / gameengine / Converter / BL_BlenderDataConversion.cpp
index 3a96322eca46f9515ad36f6c60b133d0b7eb0b6f..c8d4e76639220c796f114b4c2b34c94257ca4a80 100644 (file)
@@ -1976,8 +1976,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie,
                        frame_type = RAS_FrameSettings::e_frame_scale;
                }
                
-               aspect_width = blenderscene->gm.xsch;
-               aspect_height = blenderscene->gm.ysch;
+               aspect_width = blenderscene->r.xsch*blenderscene->r.xasp;
+               aspect_height = blenderscene->r.ysch*blenderscene->r.yasp;
        }
        
        RAS_FrameSettings frame_settings(