Merged changes in the trunk up to revision 50607.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 15 Sep 2012 00:15:24 +0000 (00:15 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 15 Sep 2012 00:15:24 +0000 (00:15 +0000)
Conflicts resolved:
source/blender/blenloader/intern/readfile.c

38 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
index 77e7623ae3d696a2a416af03f8f037c39b2735d5,45364f5aafa85081830c16b1f75740cd74e6dd19..f6e86bdbb5af191c4802f7263019958e1b56942f
  #include "BKE_gpencil.h"
  #include "BKE_fcurve.h"
  #include "BKE_speaker.h"
- #include "BKE_utildefines.h"
  #include "BKE_movieclip.h"
  #include "BKE_mask.h"
 +#include "BKE_linestyle.h"
  
  #include "RNA_access.h"
  
@@@ -912,11 -900,8 +912,11 @@@ void BKE_libblock_free(ListBase *lb, vo
                        BKE_movieclip_free((MovieClip *)id);
                        break;
                case ID_MSK:
-                       BKE_mask_free((Mask *)id);
+                       BKE_mask_free(bmain, (Mask *)id);
                        break;
 +              case ID_LS:
 +                      FRS_free_linestyle((FreestyleLineStyle *)id);
 +                      break;
        }
  
        if (id->properties) {
Simple merge
Simple merge
index 2dd6c8992d95e9ac236b8ca868fc4ad0184a86ff,bfcb935290d35bcce6f2cb487a7cb4707fa40f8f..845228fb1b9fc37608132c5019f369917ec66288
@@@ -8134,36 -7870,42 +8059,72 @@@ static void do_versions(FileData *fd, L
                        ntreetype->foreach_nodetree(main, NULL, do_version_ntree_mask_264);
        }
  
+       if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 18)) {
+               Scene *scene;
+               for (scene = main->scene.first; scene; scene = scene->id.next) {
+                       if (scene->ed) {
+                               Sequence *seq;
+                               SEQ_BEGIN (scene->ed, seq)
+                               {
+                                       Strip *strip = seq->strip;
+                                       if (strip && strip->color_balance) {
+                                               SequenceModifierData *smd;
+                                               ColorBalanceModifierData *cbmd;
+                                               smd = BKE_sequence_modifier_new(seq, NULL, seqModifierType_ColorBalance);
+                                               cbmd = (ColorBalanceModifierData *) smd;
+                                               cbmd->color_balance = *strip->color_balance;
+                                               /* multiplication with color balance used is handled differently,
+                                                * so we need to move multiplication to modifier so files would be
+                                                * compatible
+                                                */
+                                               cbmd->color_multiply = seq->mul;
+                                               seq->mul = 1.0f;
+                                               MEM_freeN(strip->color_balance);
+                                               strip->color_balance = NULL;
+                                       }
+                               }
+                               SEQ_END
+                       }
+               }
+       }
 +      /* default values in Freestyle settings */
 +      {
 +              Scene *sce;
 +              SceneRenderLayer *srl;
 +              FreestyleLineStyle *linestyle;
 +
 +              for(sce = main->scene.first; sce; sce = sce->id.next) {
 +                      if (sce->r.line_thickness_mode == 0) {
 +                              sce->r.line_thickness_mode= R_LINE_THICKNESS_ABSOLUTE;
 +                              sce->r.unit_line_thickness= 1.f;
 +                      }
 +                      for(srl= sce->r.layers.first; srl; srl= srl->next) {
 +                              if (srl->freestyleConfig.mode == 0)
 +                                      srl->freestyleConfig.mode= FREESTYLE_CONTROL_EDITOR_MODE;
 +                              if (srl->freestyleConfig.raycasting_algorithm == 0)
 +                                      srl->freestyleConfig.raycasting_algorithm= FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE;
 +                      }
 +              }
 +              for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 +                      if (linestyle->thickness_position == 0) {
 +                              linestyle->thickness_position= LS_THICKNESS_CENTER;
 +                              linestyle->thickness_ratio= 0.5f;
 +                      }
 +                      if (linestyle->chaining == 0)
 +                              linestyle->chaining= LS_CHAINING_PLAIN;
 +                      if (linestyle->rounds == 0)
 +                              linestyle->rounds= 3;
 +              }
 +      }
 +
        /* 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! */
  
Simple merge
Simple merge