* Merge trunk up to r39790. soc-2011-pepper
authorJoerg Mueller <nexyon@gmail.com>
Tue, 30 Aug 2011 08:22:03 +0000 (08:22 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Tue, 30 Aug 2011 08:22:03 +0000 (08:22 +0000)
* Subversion bump (also for init_userdef_do_versions).
* Minor fix for compilation without ffmpeg.

44 files changed:
1  2 
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_operators/nla.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/CMakeLists.txt
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/fmodifier_ui.c
source/blender/editors/armature/editarmature.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner_ops.c
source/blender/editors/space_outliner/outliner_tree.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp

Simple merge
@@@ -44,7 -44,7 +44,7 @@@ extern "C" 
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
  #define BLENDER_VERSION                       259
--#define BLENDER_SUBVERSION            0
++#define BLENDER_SUBVERSION            1
  
  #define BLENDER_MINVERSION            250
  #define BLENDER_MINSUBVERSION 0
@@@ -11749,126 -11702,13 +11743,130 @@@ static void do_versions(FileData *fd, L
                        }
                }
        }
-       /* put compatibility code here until next subversion bump */
-       {
 -      
 +
++      if (main->versionfile < 259 || (main->versionfile == 259 && main->subversionfile < 1)){
 +              {
 +                      Scene *scene;
 +                      Sequence *seq;
 +
 +                      for (scene=main->scene.first; scene; scene=scene->id.next)
 +                      {
 +                              scene->r.ffcodecdata.audio_channels = 2;
 +                              scene->audio.volume = 1.0f;
 +                              SEQ_BEGIN(scene->ed, seq) {
 +                                      seq->pitch = 1.0f;
 +                              }
 +                              SEQ_END
 +                      }
 +              }
 +              {
 +                      bScreen *screen;
 +                      for(screen= main->screen.first; screen; screen= screen->id.next) {
 +                              ScrArea *sa;
 +                              /* add regions */
 +                              for(sa= screen->areabase.first; sa; sa= sa->next) {
 +                                      SpaceLink *sl= sa->spacedata.first;
 +                                      if(sl->spacetype==SPACE_SEQ) {
 +                                              ARegion *ar;
 +                                              for (ar=sa->regionbase.first; ar; ar= ar->next) {
 +                                                      if(ar->regiontype == RGN_TYPE_WINDOW) {
 +                                                              if(ar->v2d.min[1] == 4.0f)
 +                                                                      ar->v2d.min[1]= 0.5f;
 +                                                      }
 +                                              }
 +                                      }
 +                                      for (sl= sa->spacedata.first; sl; sl= sl->next) {
 +                                              if(sl->spacetype==SPACE_SEQ) {
 +                                                      ARegion *ar;
 +                                                      for (ar=sl->regionbase.first; ar; ar= ar->next) {
 +                                                              if(ar->regiontype == RGN_TYPE_WINDOW) {
 +                                                                      if(ar->v2d.min[1] == 4.0f)
 +                                                                              ar->v2d.min[1]= 0.5f;
 +                                                              }
 +                                                      }
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +              {
 +                      /* Make "auto-clamped" handles a per-keyframe setting instead of per-FCurve 
 +                       *
 +                       * We're only patching F-Curves in Actions here, since it is assumed that most
 +                       * drivers out there won't be using this (and if they are, they're in the minority).
 +                       * While we should aim to fix everything ideally, in practice it's far too hard
 +                       * to get to every animdata block, not to mention the performance hit that'd have
 +                       */
 +                      bAction *act;
 +                      FCurve *fcu;
 +                      
 +                      for (act = main->action.first; act; act = act->id.next) {
 +                              for (fcu = act->curves.first; fcu; fcu = fcu->next) {
 +                                      BezTriple *bezt;
 +                                      unsigned int i = 0;
 +                                      
 +                                      /* only need to touch curves that had this flag set */
 +                                      if ((fcu->flag & FCURVE_AUTO_HANDLES) == 0)
 +                                              continue;
 +                                      if ((fcu->totvert == 0) || (fcu->bezt == NULL))
 +                                              continue;
 +                                              
 +                                      /* only change auto-handles to auto-clamped */
 +                                      for (bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
 +                                              if (bezt->h1 == HD_AUTO) bezt->h1 = HD_AUTO_ANIM;
 +                                              if (bezt->h2 == HD_AUTO) bezt->h2 = HD_AUTO_ANIM;
 +                                      }
 +                                      
 +                                      fcu->flag &= ~FCURVE_AUTO_HANDLES;
 +                              }
 +                      }
 +              }
 +              {
 +                      /* convert fcurve and shape action actuators to action actuators */
 +                      Object *ob;
 +                      bActuator *act;
 +                      bIpoActuator *ia;
 +                      bActionActuator *aa;
 +
 +                      for (ob= main->object.first; ob; ob= ob->id.next) {
 +                              for (act= ob->actuators.first; act; act= act->next) {
 +                                      if (act->type == ACT_IPO) {
 +                                              // Create the new actuator
 +                                              ia= act->data;
 +                                              aa= MEM_callocN(sizeof(bActionActuator), "fcurve -> action actuator do_version");
 +
 +                                              // Copy values
 +                                              aa->type = ia->type;
 +                                              aa->flag = ia->flag;
 +                                              aa->sta = ia->sta;
 +                                              aa->end = ia->end;
 +                                              strcpy(aa->name, ia->name);
 +                                              strcpy(aa->frameProp, ia->frameProp);
 +                                              if (ob->adt)
 +                                                      aa->act = ob->adt->action;
 +
 +                                              // Get rid of the old actuator
 +                                              MEM_freeN(ia);
 +
 +                                              // Assign the new actuator
 +                                              act->data = aa;
 +                                              act->type= act->otype= ACT_ACTION;
 +                                              
 +                                      }
 +                                      else if (act->type == ACT_SHAPEACTION)  {
 +                                              act->type = act->otype = ACT_ACTION;
 +                                      }
 +                              }
 +                      }
 +              }
 +      }
-       
++
+       /* put compatibility code here until next subversion bump */
+       {
 -      
++
+       }
 -      
++
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
  
@@@ -39,30 -39,11 +39,12 @@@ set(IN
  )
  
  set(INC_SYS
+       ${OPENCOLLADA_INCLUDE_DIRS}
  )
  
- if(APPLE)
-       list(APPEND INC_SYS
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader
-               ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser
-       )
- else()
-       list(APPEND INC_SYS
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter/include
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils/include
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework/include
-               ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader/include
-               ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser/include
-       )
- endif()
  set(SRC
        AnimationImporter.cpp
 +      AnimationExporter.cpp
        ArmatureExporter.cpp
        ArmatureImporter.cpp
        CameraExporter.cpp
@@@ -1570,24 -1561,9 +1570,32 @@@ void init_userdef_do_versions(void
                bTheme *btheme;
                for(btheme= U.themes.first; btheme; btheme= btheme->next) {
                        btheme->tnode.noodle_curving = 5;
 +              }
 +      }
 +
 +      if (bmain->versionfile < 258 || (bmain->versionfile == 258 && bmain->subversionfile < 1)) {
 +              bTheme *btheme;
 +              
 +              /* if new keyframes handle default is stuff "auto", make it "auto-clamped" instead */
 +              if (U.keyhandles_new == HD_AUTO) 
 +                      U.keyhandles_new = HD_AUTO_ANIM;
 +                      
 +              /* theme color additions */
 +              for (btheme= U.themes.first; btheme; btheme= btheme->next) {
 +                      /* auto-clamped handles -> based on auto */
 +                      SETCOL(btheme->tipo.handle_auto_clamped, 0x99, 0x40, 0x30, 255);
 +                      SETCOL(btheme->tipo.handle_sel_auto_clamped, 0xf0, 0xaf, 0x90, 255);
 +              }
 +      }
 +      
++      if (bmain->versionfile < 259 || (bmain->versionfile == 259 && bmain->subversionfile < 1)) {
++              bTheme *btheme;
++
++              for(btheme= U.themes.first; btheme; btheme= btheme->next) {
++                      btheme->tv3d.speaker[3] = 255;
+               }
+       }
        /* GL Texture Garbage Collection (variable abused above!) */
        if (U.textimeout == 0) {
                U.texcollectrate = 60;
@@@ -2218,6 -2182,6 +2210,14 @@@ static void rna_def_scene_render_data(B
                {0, NULL, 0, NULL, NULL}};
  #endif
  
++      static EnumPropertyItem audio_channel_items[] = {
++              {1, "MONO", 0, "Mono", "Set audio channels to mono"},
++              {2, "STEREO", 0, "Stereo", "Set audio channels to stereo"},
++              {4, "SURROUND4", 0, "4 Channels", "Set audio channels to 4 channels"},
++              {6, "SURROUND51", 0, "5.1 Surround", "Set audio channels to 5.1 surround sound"},
++              {8, "SURROUND71", 0, "7.1 Surround", "Set audio channels to 7.1 surround sound"},
++              {0, NULL, 0, NULL, NULL}};
++
        static EnumPropertyItem engine_items[] = {
                {0, "BLENDER_RENDER", 0, "Blender Render", "Use the Blender internal rendering engine for rendering"},
                {0, NULL, 0, NULL, NULL}};