Merged changes in the trunk up to revision 42556.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Dec 2011 20:54:43 +0000 (20:54 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 10 Dec 2011 20:54:43 +0000 (20:54 +0000)
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c

14 files changed:
1  2 
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c

Simple merge
index 2d49ed533da9a6d3d564e3beb6c2a6d58341e84c,b3eba8652b021b22585d0a5590bc13c49831cd82..74d804da7df058772ed9451f208be2f3466a7ccc
@@@ -2360,7 -2349,7 +2360,7 @@@ static void draw_dm_edges_freestyle(Der
         * return 2 for the active face so it renders with stipple enabled */
  static int draw_dm_faces_sel__setDrawOptions(void *userData, int index, int *UNUSED(drawSmooth_r))
  {
-       struct { DerivedMesh *dm; unsigned char *cols[4]; EditFace *efa_act; } * data = userData;
 -      struct { unsigned char *cols[3]; EditFace *efa_act; int *orig_index; } * data = userData;
++      struct { unsigned char *cols[4]; EditFace *efa_act; int *orig_index; } * data = userData;
        EditFace *efa = EM_get_face_for_index(index);
        unsigned char *col;
        
  
  static int draw_dm_faces_sel__compareDrawOptions(void *userData, int index, int next_index)
  {
-       struct { DerivedMesh *dm; unsigned char *cols[4]; EditFace *efa_act; } *data = userData;
-       int *orig_index= DM_get_face_data_layer(data->dm, CD_ORIGINDEX);
 -      struct { unsigned char *cols[3]; EditFace *efa_act; int *orig_index; } *data = userData;
++      struct { unsigned char *cols[4]; EditFace *efa_act; int *orig_index; } *data = userData;
        EditFace *efa;
        EditFace *next_efa;
        unsigned char *col, *next_col;
  }
  
  /* also draws the active face */
 -static void draw_dm_faces_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol, unsigned char *actCol, EditFace *efa_act) 
 +static void draw_dm_faces_sel(DerivedMesh *dm, unsigned char *baseCol, unsigned char *selCol, unsigned char *markCol, unsigned char *actCol, EditFace *efa_act) 
  {
-       struct { DerivedMesh *dm; unsigned char *cols[4]; EditFace *efa_act; } data;
-       data.dm= dm;
 -      struct { unsigned char *cols[3]; EditFace *efa_act; int *orig_index; } data;
++      struct { unsigned char *cols[4]; EditFace *efa_act; int *orig_index; } data;
        data.cols[0] = baseCol;
        data.cols[1] = selCol;
 -      data.cols[2] = actCol;
 +      data.cols[2] = markCol;
 +      data.cols[3] = actCol;
        data.efa_act = efa_act;
+       data.orig_index = DM_get_face_data_layer(dm, CD_ORIGINDEX);
  
        dm->drawMappedFaces(dm, draw_dm_faces_sel__setDrawOptions, GPU_enable_material, draw_dm_faces_sel__compareDrawOptions, &data, 0);
  }
index 683bbaff32c9bde202c90a604a9f7056f4d050b7,a62da4c3f7e3e6f4c92a06414d9979e9f2f436db..4375653ecbe7f0e166b6b13da5381a747f97ac36
@@@ -590,8 -572,7 +590,8 @@@ void rna_Main_armatures_tag(Main *bmain
  void rna_Main_actions_tag(Main *bmain, int value) { tag_main_lb(&bmain->action, value); }
  void rna_Main_particles_tag(Main *bmain, int value) { tag_main_lb(&bmain->particle, value); }
  void rna_Main_gpencil_tag(Main *bmain, int value) { tag_main_lb(&bmain->gpencil, value); }
- void rna_Main_movieclips_tag(Main *bmain, int value) { tag_main_lb(&bmain->text, value); }
+ void rna_Main_movieclips_tag(Main *bmain, int value) { tag_main_lb(&bmain->movieclip, value); }
 +void rna_Main_linestyle_tag(Main *bmain, int value) { tag_main_lb(&bmain->linestyle, value); }
  
  static int rna_Main_cameras_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_CA); }
  static int rna_Main_scenes_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_SCE); }