soc-2008-mxcurioni: merged changes to revision 15441
authorMaxime Curioni <maxime.curioni@gmail.com>
Sat, 5 Jul 2008 13:30:48 +0000 (13:30 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Sat, 5 Jul 2008 13:30:48 +0000 (13:30 +0000)
27 files changed:
1  2 
extern/SConscript
release/scripts/vrml97_export.py
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/BLI_winstuff.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/python/BPY_interface.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rendercore.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/buttons_scene.c
source/blender/src/buttons_shading.c
source/blender/src/editcurve.c
source/blender/src/editmesh_lib.c
source/blender/src/editobject.c
source/blender/src/editseq.c
source/blender/src/sequence.c
source/blender/src/space.c
source/blender/src/usiblender.c
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/PyDoc/KX_GameObject.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1cff92b315f647fbd7e6c150f610c004c7450a5b,6851929bbc21fff352acecbb7e61521640d6c5e3..7f80de2aff8fe055023ee9c3c2e7669b6b8d40b9
@@@ -1773,12 -1772,14 +1776,15 @@@ static void do_build_seq_ibuf(Sequence 
  
                        if (se->ibuf == 0) {
                                if(seq->anim==0) {
 -                                      BLI_join_dirfile(name, seq->strip->dir, seq->strip->stripdata->name);
 +                                      strncpy(name, seq->strip->dir, FILE_MAXDIR-1);
 +                                      strncat(name, seq->strip->stripdata->name, FILE_MAXFILE-1);
                                        BLI_convertstringcode(name, G.sce);
                                        BLI_convertstringframe(name, G.scene->r.cfra);
-                               
-                                       seq->anim = openanim(name, IB_rect);
+                                       
+                                       seq->anim = openanim(
+                                               name, IB_rect | 
+                                               ((seq->flag & SEQ_FILTERY) 
+                                                ? IB_animdeinterlace : 0));
                                }
                                if(seq->anim) {
                                        IMB_anim_set_preseek(seq->anim, seq->anim_preseek);
Simple merge
Simple merge
index fbd896a55d13996faff54546bd901c0a1d0c897a,37c188b7f2249cdfa2ae8ded824f592b92d942de..cc2fdeb0ffe0c15aa3898def2a314ab84e46377c
@@@ -50,6 -76,30 +76,18 @@@ class KX_GameObject
                
                @type orn: 3x3 rotation matrix, or Quaternion.
                @param orn: a rotation matrix specifying the new rotation.
 -      def alignAxisToVect(vect, axis):
 -              """
 -              Aligns any of the game object's axis along the given vector.
 -              
 -              @type vect: 3d vector.
 -              @param vect: a vector to align the axis.
 -              @type axis: integer.
 -              @param axis:The axis you want to align
 -                                      - 0: X axis
 -                                      - 1: Y axis
 -                                      - 2: Z axis (default) 
 -              """
+               @note: When using this matrix with Blender.Mathutils.Matrix() types, it will need to be transposed.
+               """
+       def getAxisVect(vect):
+               """
+               Returns the axis vector rotates by the objects worldspace orientation.
+               This is the equivalent if multiplying the vector by the orientation matrix.
+               
+               @type vect: 3d vector.
+               @param vect: a vector to align the axis.
+               @rtype: 3d vector.
+               @return: The vector in relation to the objects rotation.
                """
        def getOrientation():
                """