Merged changes in the trunk up to revision 46045.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 29 Apr 2012 00:59:04 +0000 (00:59 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 29 Apr 2012 00:59:04 +0000 (00:59 +0000)
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h

54 files changed:
1  2 
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.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/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_operators.h
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
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/mesh/mesh_ops.c
source/blender/editors/render/SConscript
source/blender/editors/render/render_shading.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/SConscript
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_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/SConscript
source/blender/python/intern/bpy.c
source/blender/render/SConscript
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/SConscript
source/creator/CMakeLists.txt

Simple merge
@@@ -261,8 -261,7 +261,8 @@@ else
          "mathutils",
          "mathutils.geometry",
          "mathutils.noise",
-     )
 +        "Freestyle",
+         ]
  
      # ------
      # Filter
Simple merge
@@@ -898,11 -886,8 +898,11 @@@ void free_libblock(ListBase *lb, void *
                        free_gpencil_data((bGPdata *)id);
                        break;
                case ID_MC:
-                       free_movieclip((MovieClip *)id);
+                       BKE_movieclip_free((MovieClip *)id);
                        break;
 +              case ID_LS:
 +                      FRS_free_linestyle((FreestyleLineStyle *)id);
 +                      break;
        }
  
        if (id->properties) {
@@@ -627,20 -625,13 +627,21 @@@ void unlink_object(Object *ob
  #endif
                        if (sce->ed) {
                                Sequence *seq;
-                               SEQ_BEGIN(sce->ed, seq)
-                                       if (seq->scene_camera==ob) {
-                                               seq->scene_camera= NULL;
+                               SEQ_BEGIN (sce->ed, seq) {
+                                       if (seq->scene_camera == ob) {
+                                               seq->scene_camera = NULL;
                                        }
+                               }
                                SEQ_END
                        }
 +
 +                      {
 +                              SceneRenderLayer *srl;
 +
 +                              for (srl= sce->r.layers.first; srl; srl= srl->next) {
 +                                      FRS_unlink_target_object(&srl->freestyleConfig, ob);
 +                              }
 +                      }
                }
  
                sce= sce->id.next;
@@@ -918,12 -918,11 +918,11 @@@ static void ccgDM_getFinalEdge(DerivedM
                x = edgeNum - ccgdm->edgeMap[i].startEdge;
  
                med->v1 = getEdgeIndex(ss, e, x, edgeSize);
-               med->v2 = getEdgeIndex(ss, e, x+1, edgeSize);
+               med->v2 = getEdgeIndex(ss, e, x + 1, edgeSize);
  
-               edgeFlag = (ccgdm->edgeFlags)? &ccgdm->edgeFlags[i]: NULL;
+               edgeFlag = (ccgdm->edgeFlags) ? &ccgdm->edgeFlags[i] : NULL;
                if (edgeFlag)
-                       flags |= (*edgeFlag & (ME_SEAM | ME_SHARP | ME_FREESTYLE_EDGE))
-                                        | ME_EDGEDRAW | ME_EDGERENDER;
 -                      flags |= (*edgeFlag & (ME_SEAM | ME_SHARP)) | ME_EDGEDRAW | ME_EDGERENDER;
++                      flags |= (*edgeFlag & (ME_SEAM | ME_SHARP | ME_FREESTYLE_EDGE)) | ME_EDGEDRAW | ME_EDGERENDER;
                else
                        flags |= ME_EDGEDRAW | ME_EDGERENDER;
  
@@@ -1145,8 -1144,8 +1144,8 @@@ static void ccgDM_copyFinalEdgeArray(De
  
                if (edgeFlags) {
                        if (edgeIdx != -1) {
 -                              flags |= (edgeFlags[index] & (ME_SEAM | ME_SHARP))
 +                              flags |= (edgeFlags[index] & (ME_SEAM | ME_SHARP | ME_FREESTYLE_EDGE))
-                                                | ME_EDGEDRAW | ME_EDGERENDER;
+                                        | ME_EDGEDRAW | ME_EDGERENDER;
                        }
                }
                else {
Simple merge
Simple merge
@@@ -13486,41 -13261,6 +13450,36 @@@ static void do_versions(FileData *fd, L
                        part->flag |= PART_ROTATIONS;
        }
  
-       /* put compatibility code here until next subversion bump */
-       {
-       }
 +      /* 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! */
  
@@@ -586,8 -585,10 +585,7 @@@ int transformEvent(TransInfo *t, wmEven
  
        t->redraw |= handleMouseInput(t, &t->mouse, event);
  
-       if (event->type == MOUSEMOVE)
-       {
+       if (event->type == MOUSEMOVE) {
 -              if (t->modifiers & MOD_CONSTRAINT_SELECT)
 -                      t->con.mode |= CON_SELECT;
 -
                copy_v2_v2_int(t->mval, event->mval);
  
                // t->redraw |= TREDRAW_SOFT; /* Use this for soft redraw. Might cause flicker in object mode */
@@@ -1794,11 -1773,7 +1770,10 @@@ void transformApply(bContext *C, TransI
  {
        t->context = C;
  
-       if ((t->redraw & TREDRAW_HARD) || (t->draw_handle_apply == NULL && (t->redraw & TREDRAW_SOFT)))
-       {
+       if ((t->redraw & TREDRAW_HARD) || (t->draw_handle_apply == NULL && (t->redraw & TREDRAW_SOFT))) {
 +              if (t->modifiers & MOD_CONSTRAINT_SELECT)
 +                      t->con.mode |= CON_SELECT;
 +
                selectConstraint(t);
                if (t->transform) {
                        t->transform(t, t->mval);  // calls recalcData()
@@@ -493,8 -492,9 +492,8 @@@ void initTransformOrientation(bContext 
        Object *ob = CTX_data_active_object(C);
        Object *obedit = CTX_data_active_object(C);
  
-       switch(t->current_orientation) {
+       switch (t->current_orientation) {
        case V3D_MANIP_GLOBAL:
 -              unit_m3(t->spacemtx);
                strcpy(t->spacename, "global");
                break;
  
@@@ -177,17 -176,16 +177,19 @@@ typedef struct SceneRenderLayer 
        struct Material *mat_override;
        struct Group *light_override;
        
-       unsigned int lay;               /* scene->lay itself has priority over this */
-       unsigned int lay_zmask; /* has to be after lay, this is for Z-masking */
+       unsigned int lay;                 /* scene->lay itself has priority over this */
+       unsigned int lay_zmask;   /* has to be after lay, this is for Z-masking */
+       unsigned int lay_exclude; /* not used by internal, exclude */
        int layflag;
        
-       int pad;
-       
        int passflag;                   /* pass_xor has to be after passflag */
        int pass_xor;
+       int samples;
+       int pad;
 +      
 +      struct FreestyleConfig freestyleConfig;
 +      
  } SceneRenderLayer;
  
  /* srl->layflag */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge