From 51a66c27f31261c6c85c3a24c1ac404cea0caf5a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 29 Nov 2010 20:57:02 +0000 Subject: replace overly verbose matrix creation for BGE camera, typo fix from MikeS. --- source/blender/makesrna/intern/rna_sequencer.c | 2 +- .../BlenderRoutines/BL_KetsjiEmbedStart.cpp | 19 ++----------------- 2 files changed, 3 insertions(+), 18 deletions(-) (limited to 'source') diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 958adad86e3..233ffd06188 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -1320,7 +1320,7 @@ static void rna_def_sound(BlenderRNA *brna) prop= RNA_def_property(srna, "attenuation", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, -100.0f, +40.0f); - RNA_def_property_ui_text(prop, "Attenuation/db", "Attenuation in dezibel"); + RNA_def_property_ui_text(prop, "Attenuation/dB", "Attenuation in decibel"); RNA_def_property_float_funcs(prop, "rna_Sequence_attenuation_get", "rna_Sequence_attenuation_set", NULL); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); diff --git a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp index 9de4020ecff..c672d07a3cc 100644 --- a/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp +++ b/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp @@ -235,21 +235,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c } // some blender stuff - MT_CmMatrix4x4 projmat; - MT_CmMatrix4x4 viewmat; float camzoom; - int i; - - for (i = 0; i < 16; i++) - { - float *viewmat_linear= (float*) rv3d->viewmat; - viewmat.setElem(i, viewmat_linear[i]); - } - for (i = 0; i < 16; i++) - { - float *projmat_linear= (float*) rv3d->winmat; - projmat.setElem(i, projmat_linear[i]); - } if(rv3d->persp==RV3D_CAMOB) { if(startscene->gm.framing.type == SCE_GAMEFRAMING_BARS) { /* Letterbox */ @@ -265,7 +251,6 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c camzoom = 2.0; } - ketsjiengine->SetDrawType(v3d->drawtype); ketsjiengine->SetCameraZoom(camzoom); @@ -347,8 +332,8 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c { ketsjiengine->EnableCameraOverride(startscenename); ketsjiengine->SetCameraOverrideUseOrtho((rv3d->persp == RV3D_ORTHO)); - ketsjiengine->SetCameraOverrideProjectionMatrix(projmat); - ketsjiengine->SetCameraOverrideViewMatrix(viewmat); + ketsjiengine->SetCameraOverrideProjectionMatrix(MT_CmMatrix4x4(rv3d->winmat)); + ketsjiengine->SetCameraOverrideViewMatrix(MT_CmMatrix4x4(rv3d->viewmat)); ketsjiengine->SetCameraOverrideClipping(v3d->near, v3d->far); ketsjiengine->SetCameraOverrideLens(v3d->lens); } -- cgit v1.2.3