Merged changes in the trunk up to revision 50956.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Sep 2012 13:16:55 +0000 (13:16 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Sep 2012 13:16:55 +0000 (13:16 +0000)
Conflicts resolved:
source/blender/editors/interface/resources.c

23 files changed:
1  2 
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/BKE_main.h
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/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

Simple merge
index 1d0cd2707acfaa9ecaca030433c8c0465885f876,1efb24341b821f22d225134841debfde4f42c996..a964052cc23b9629d5c7a65b1d5b20d0621e9869
@@@ -1940,19 -1935,18 +1941,31 @@@ void init_userdef_do_versions(void
                }
        }
  
+       if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 22)) {
+               bTheme *btheme;
+               for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+                       if (btheme->tipo.lastsel_point[3] == 0)
+                               rgba_char_args_set(btheme->tipo.lastsel_point, 0xff, 0xff, 0xff, 255);
+                       if (btheme->tv3d.skin_root[3] == 0)
+                               rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255);
+               }
+       }
 +      /* 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) {
 +                              rgba_char_args_set(btheme->tv3d.freestyle_edge_mark, 0x7f, 0xff, 0x7f, 255);
 +                              rgba_char_args_set(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
index ecd8524016d8abf993bfdca7f67a61961f2f963c,b1b88fc9fd54662cbb166f1999d96d7698b01cbf..981f705e07cb9e569be40842b68883f7a5183e6e
@@@ -2175,23 -2094,6 +2175,15 @@@ void RE_BlenderFrame(Render *re, Main *
        G.is_rendering = FALSE;
  }
  
- static void colormanage_image_for_write(Scene *scene, ImBuf *ibuf)
- {
-       IMB_display_buffer_to_imbuf_rect(ibuf, &scene->view_settings, &scene->display_settings);
-       if (ibuf)
-               imb_freerectfloatImBuf(ibuf);
- }
 +void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene)
 +{
 +      re->result_ok= 0;
 +      if(render_initialize_from_main(re, bmain, scene, NULL, NULL, scene->lay, 0, 0)) {
 +              do_render_fields_blur_3d(re);
 +      }
 +      re->result_ok= 1;
 +}
 +
  static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override)
  {
        char name[FILE_MAX];
Simple merge