Merged changes in the trunk up to revision 43585.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Jan 2012 23:01:25 +0000 (23:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Jan 2012 23:01:25 +0000 (23:01 +0000)
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

29 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/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.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_channels_edit.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

Simple merge
Simple merge
index 683d35daf66e74b5329ba3d94d59149b2ed27bd5,6e921a0ca8c0c18af6e6d71024d80ccfab721040..75aa996088f90c81e5727990920bbd5d352c350d
@@@ -256,8 -187,14 +187,16 @@@ enum 
        TH_PATH_AFTER,
        TH_CAMERA_PATH,
        TH_LOCK_MARKER,
 -      TH_STITCH_PREVIEW_ACTIVE
+       TH_STITCH_PREVIEW_FACE,
+       TH_STITCH_PREVIEW_EDGE,
+       TH_STITCH_PREVIEW_VERT,
+       TH_STITCH_PREVIEW_STITCHABLE,
+       TH_STITCH_PREVIEW_UNSTITCHABLE,
++      TH_STITCH_PREVIEW_ACTIVE,
 +      TH_FREESTYLE_EDGE_MARK,
 +      TH_FREESTYLE_FACE_MARK
  };
  /* XXX WARNING: previous is saved in file, so do not change order! */
  
index 53a48e1769829798b3e827caf7d05cf17c17050c,ad20ff0b6dd55205cb5737d68087a7b348a105e5..472e2088d4323f8a37d3632adb874a57daa57cbf
@@@ -1685,19 -1706,19 +1712,32 @@@ void init_userdef_do_versions(void
                }
        }
  
+       if (bmain->versionfile < 262){
+               bTheme *btheme;
+               for(btheme= U.themes.first; btheme; btheme= btheme->next) {
+                       SETCOLF(btheme->tima.preview_stitch_face, 0.071, 0.259, 0.694, 0.150);
+                       SETCOLF(btheme->tima.preview_stitch_edge, 1.0, 0.522, 0.0, 0.7);
+                       SETCOLF(btheme->tima.preview_stitch_vert, 1.0, 0.522, 0.0, 0.5);
+                       SETCOLF(btheme->tima.preview_stitch_stitchable, 0.0, 1.0, 0.0, 1.0);
+                       SETCOLF(btheme->tima.preview_stitch_unstitchable, 1.0, 0.0, 0.0, 1.0);
+                       SETCOLF(btheme->tima.preview_stitch_active, 0.886, 0.824, 0.765, 0.140);
+               }
+               U.use_16bit_textures = 0;
+       }
+       
 +      /* Freestyle color settings */
 +      {
 +              bTheme *btheme;
 +
 +              for(btheme= U.themes.first; btheme; btheme= btheme->next) {
 +                      /* check for alpha==0 is safe, then color was never set */
 +                      if(btheme->tv3d.freestyle_edge_mark[3]==0) {
 +                              SETCOL(btheme->tv3d.freestyle_edge_mark, 0x7f, 0xff, 0x7f, 255);
 +                              SETCOL(btheme->tv3d.freestyle_face_mark, 0x7f, 0xff, 0x7f, 51);
 +                      }
 +              }
 +      }
 +
        /* GL Texture Garbage Collection (variable abused above!) */
        if (U.textimeout == 0) {
                U.texcollectrate = 60;
Simple merge
Simple merge
index e8b6e9e05d3c79d3f18a2b016a06edcac140380c,7f01a9387b5f2204d1dcce0e15583b894472e929..9be42ad13afc5ea119da8ebe599d00cd05d78a32
@@@ -271,8 -283,11 +284,13 @@@ EnumPropertyItem image_color_depth_item
  
  #include "RE_engine.h"
  
 +#include "FRS_freestyle.h"
 +
+ static void rna_SpaceImageEditor_uv_sculpt_update(Main *bmain, Scene *scene, PointerRNA *UNUSED(ptr))
+ {
+       ED_space_image_uv_sculpt_update(bmain->wm.first, scene->toolsettings);
+ }
  static int rna_Scene_object_bases_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
  {
        Scene *scene= (Scene*)ptr->data;
Simple merge
Simple merge