Merged changes in the trunk up to revision 48893.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 13 Jul 2012 23:23:06 +0000 (23:23 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Fri, 13 Jul 2012 23:23:06 +0000 (23:23 +0000)
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h

34 files changed:
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
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/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.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/space_file/filelist.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/extern/include/RE_pipeline.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/render/intern/source/shadeoutput.c
source/blender/windowmanager/intern/wm_files.c
source/creator/CMakeLists.txt
source/creator/creator.c

index 723a0e32605f7aaa3f1f7308d646efadcd7be8f2,8ae705fa3eb32bbb41a07dac75d34ef0f284276b..1bafc023740fb749dbbda0e60306c8632d86f3c9
@@@ -102,7 -101,7 +102,8 @@@ set(SR
        intern/lamp.c
        intern/lattice.c
        intern/library.c
 +      intern/linestyle.c
+       intern/mask_rasterize.c
        intern/mask.c
        intern/material.c
        intern/mball.c
index 735f1fcaa551ea9d18db8a7a5877c67c929bab7b,bfa73c5f7dddcb01900df1c509eb2900bd0d0222..53b9f8064c49ac643300bb59168155abc33c77c0
@@@ -8014,36 -7844,13 +8033,43 @@@ static void do_versions(FileData *fd, L
                        ntreetype->foreach_nodetree(main, NULL, do_version_ntree_dilateerode_264);
        }
  
+       if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 14)) {
+               bNodeTreeType *ntreetype = ntreeGetType(NTREE_COMPOSIT);
+               if (ntreetype && ntreetype->foreach_nodetree)
+                       ntreetype->foreach_nodetree(main, NULL, do_version_ntree_keying_despill_balance);
+       }
 +      /* 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! */
  
index 7f957d49fa3a73d681aa40b9c90cbdcb0671c83c,6144cc4ecc1a4223df6ed8db40fba0077d9cff6a..81b6d77dd82a14169450538d7b931f2ee412a653
@@@ -2185,15 -2123,10 +2185,15 @@@ static size_t animdata_filter_dopesheet
                        tmp_items += animdata_filter_ds_nodetree(ac, &tmp_data, ads, (ID *)sce, ntree, filter_mode);
                }
  
-               // TODO: one day, when sequencer becomes its own datatype, perhaps it should be included here
 +              /* line styles */
 +              if ((ads->filterflag & ADS_FILTER_NOLINESTYLE) == 0) {
 +                      tmp_items += animdata_filter_ds_linestyle(ac, &tmp_data, ads, sce, filter_mode);
 +              }
 +              
+               /* TODO: one day, when sequencer becomes its own datatype, perhaps it should be included here */
        }
        END_ANIMFILTER_SUBCHANNELS;
-       
        /* if we collected some channels, add these to the new list... */
        if (tmp_items) {
                /* firstly add object expander if required */
index 7210944d3e72c25cfbb51e4f55c234fdb2803ace,b651dfcb8dbb65b84b6e6531688d91dad505665a..919772bbf46e63142ef0d45776a380c0c57afd87
@@@ -3237,40 -3221,36 +3237,40 @@@ static void draw_em_fancy(Scene *scene
  
                UI_GetThemeColor4ubv(TH_FACE, col1);
                UI_GetThemeColor4ubv(TH_FACE_SELECT, col2);
 -              UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
 +              UI_GetThemeColor4ubv(TH_FREESTYLE_FACE_MARK, col3);
 +              UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col4);
-               
                glEnable(GL_BLEND);
-               glDepthMask(0);     // disable write in zbuffer, needed for nice transp
-               
+               glDepthMask(0);  /* disable write in zbuffer, needed for nice transp */
                /* don't draw unselected faces, only selected, this is MUCH nicer when texturing */
                if (check_object_draw_texture(scene, v3d, dt))
                        col1[3] = 0;
-               
 -              draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
 +              if (!(me->drawflag & ME_DRAW_FREESTYLE_FACE))
 +                      col3[3] = 0;
 +
 +              draw_dm_faces_sel(em, cageDM, col1, col2, col3, col4, efa_act);
  
                glDisable(GL_BLEND);
-               glDepthMask(1);     // restore write in zbuffer
+               glDepthMask(1);  /* restore write in zbuffer */
        }
        else if (efa_act) {
                /* even if draw faces is off it would be nice to draw the stipple face
                 * Make all other faces zero alpha except for the active
                 * */
 -              unsigned char col1[4], col2[4], col3[4];
 -              col1[3] = col2[3] = 0; /* don't draw */
 -              UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col3);
 +              unsigned char col1[4], col2[4], col3[4], col4[4];
 +              col1[3] = col2[3] = col3[3] = 0; /* don't draw */
 +              UI_GetThemeColor4ubv(TH_EDITMESH_ACTIVE, col4);
-               
                glEnable(GL_BLEND);
-               glDepthMask(0);     // disable write in zbuffer, needed for nice transp
-               
+               glDepthMask(0);  /* disable write in zbuffer, needed for nice transp */
 -              draw_dm_faces_sel(em, cageDM, col1, col2, col3, efa_act);
 +              draw_dm_faces_sel(em, cageDM, col1, col2, col3, col4, efa_act);
  
                glDisable(GL_BLEND);
-               glDepthMask(1);     // restore write in zbuffer
-               
+               glDepthMask(1);  /* restore write in zbuffer */
        }
  
        /* here starts all fancy draw-extra over */
Simple merge
index f8c0f6a591035ed37fef4615cf27f89ad994f986,6436d04f54f83e4581ccc35b0c6605fe579eac9e..ab320322f83f1aaa6bdfc5884a80be99dfcb4991
@@@ -133,10 -133,8 +133,10 @@@ static const char *includefiles[] = 
        "DNA_tracking_types.h",
        "DNA_dynamicpaint_types.h",
        "DNA_mask_types.h",
 +      "DNA_freestyle_types.h",
 +      "DNA_linestyle_types.h",
  
-       // empty string to indicate end of includefiles
+       /* empty string to indicate end of includefiles */
        ""
  };
  
Simple merge
index 6f024cde1d0b9659360b3994320b04fe0bd590c6,2fbee1e9e1a78d17abfcaab3e0056d61c1d253dc..c722e6fa5ab2ef68e6df58150c0fc142e18c1f9d
@@@ -127,11 -127,8 +127,13 @@@ extern EnumPropertyItem ramp_blend_item
  
  extern EnumPropertyItem prop_dynamicpaint_type_items[];
  
+ extern EnumPropertyItem clip_editor_mode_items[];
 +extern EnumPropertyItem linestyle_color_modifier_type_items[];
 +extern EnumPropertyItem linestyle_alpha_modifier_type_items[];
 +extern EnumPropertyItem linestyle_thickness_modifier_type_items[];
 +extern EnumPropertyItem linestyle_geometry_modifier_type_items[];
 +
  struct bContext;
  struct PointerRNA;
  struct PropertyRNA;
Simple merge
Simple merge