Merged changes in the trunk up to revision 44612.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 3 Mar 2012 01:43:44 +0000 (01:43 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 3 Mar 2012 01:43:44 +0000 (01:43 +0000)
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h

36 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/anim_sys.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/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.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/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/shadeoutput.c

index 79a534a969e8093a2323d8cd61a14184605275c7,fa42c2e58888eee55c912056d1fc52d51adb1f41..2b07b0c3611a77e43add13c6b02ae7119b707bf4
@@@ -142,12 -162,8 +163,9 @@@ except ImportError
  ClassMethodDescriptorType = type(dict.__dict__['fromkeys'])
  MethodDescriptorType = type(dict.get)
  GetSetDescriptorType = type(int.real)
 +StaticMethodType = type(staticmethod(lambda: None))
  from types import MemberDescriptorType
  
- EXAMPLE_SET = set()
- EXAMPLE_SET_USED = set()
  _BPY_STRUCT_FAKE = "bpy_struct"
  _BPY_PROP_COLLECTION_FAKE = "bpy_prop_collection"
  _BPY_FULL_REBUILD = False
index 9867292d2abd64313ea98a1e050de01683c1f2c2,ea353fc90731d9f9f84adee7412be377f38d141d..ec5bfbb2cdce129d32fce61285d60681604ff87e
@@@ -2352,12 -2345,9 +2352,12 @@@ void BKE_animsys_evaluate_all_animatio
        /* movie clips */
        EVAL_ANIM_IDS(main->movieclip.first, ADT_RECALC_ANIM);
  
 +      /* linestyles */
 +      EVAL_ANIM_IDS(main->linestyle.first, ADT_RECALC_ANIM);
 +      
        /* objects */
                /* ADT_RECALC_ANIM doesn't need to be supplied here, since object AnimData gets 
-                * this tagged by Depsgraph on framechange. This optimisation means that objects
+                * this tagged by Depsgraph on framechange. This optimization means that objects
                 * linked from other (not-visible) scenes will not need their data calculated.
                 */
        EVAL_ANIM_IDS(main->object.first, 0); 
Simple merge
index e3dca8db2993b3fd4ce407c9ff5593d5687b2734,fafddaa544f001608fbddcd1ed0525e1ff89379b..09a7d92baa8378a373b94d235599d9b6acacefab
@@@ -13353,29 -13235,22 +13424,44 @@@ static void do_versions(FileData *fd, L
                }
        }
  
+       if (main->versionfile < 262 || (main->versionfile == 262 && main->subversionfile < 1))
+       {
+               /* update use flags for node sockets (was only temporary before) */
+               Scene *sce;
+               bNodeTree *ntree;
+               
+               for (sce=main->scene.first; sce; sce=sce->id.next)
+                       if (sce->nodetree)
+                               do_versions_nodetree_multi_file_output_format_2_62_1(sce, sce->nodetree);
+               
+               /* XXX can't associate with scene for group nodes, image format will stay uninitialized */
+               for (ntree=main->nodetree.first; ntree; ntree=ntree->id.next)
+                       do_versions_nodetree_multi_file_output_format_2_62_1(NULL, ntree);
+       }
  
 +      /* default values in Freestyle settings */
 +      {
 +              Scene *sce;
 +              SceneRenderLayer *srl;
 +              FreestyleLineStyle *linestyle;
 +
 +              for(sce = main->scene.first; sce; sce = sce->id.next) {
 +                      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->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! */
  
index f071e00211c9f885e8ecf98ac153af7b3a8ae974,ed4e231edeab4f082fde57ebbf19b0a2d808af1b..59ad60f32e5ba61dbd704676d6c0a3286633a3e2
@@@ -188,4 -201,37 +201,39 @@@ typedef struct BMesh 
        int opflag; /* current operator flag */
  } BMesh;
  
+ /* BMHeader->htype (char) */
+ enum {
+       BM_VERT = 1,
+       BM_EDGE = 2,
+       BM_LOOP = 4,
+       BM_FACE = 8
+ };
+ #define BM_ALL (BM_VERT | BM_EDGE | BM_LOOP | BM_FACE)
+ /* BMHeader->hflag (char) */
+ enum {
+       BM_ELEM_SELECT  = (1 << 0),
+       BM_ELEM_HIDDEN  = (1 << 1),
+       BM_ELEM_SEAM    = (1 << 2),
+       BM_ELEM_SMOOTH  = (1 << 3), /* used for faces and edges, note from the user POV,
+                                   * this is a sharp edge when disabled */
+       BM_ELEM_TAG     = (1 << 4), /* internal flag, used for ensuring correct normals
+                                  * during multires interpolation, and any other time
+                                  * when temp tagging is handy.
+                                  * always assume dirty & clear before use. */
++      BM_ELEM_FREESTYLE = (1 << 5), /* used for Freestyle faces and edges */
++
+       /* we have 2 spare flags which is awesome but since we're limited to 8
+        * only add new flags with care! - campbell */
+       /* BM_ELEM_SPARE  = (1 << 5), */
+       /* BM_ELEM_SPARE  = (1 << 6), */
+       BM_ELEM_INTERNAL_TAG = (1 << 7) /* for low level internal API tagging,
+                                      * since tools may want to tag verts and
+                                      * not have functions clobber them */
+ };
  #endif /* __BMESH_CLASS_H__ */
Simple merge