Merged changes in the trunk up to revision 52118.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 12 Nov 2012 00:30:55 +0000 (00:30 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 12 Nov 2012 00:30:55 +0000 (00:30 +0000)
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

30 files changed:
1  2 
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/anim_sys.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/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.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_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.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/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt

Simple merge
index 1aec4195354bbd03979681068c91b5580e395cdf,40b883e3f4e01367bae3907f73c2f6b9536fa240..9c94e267a7e1304d76b5579becf244c3b27549f8
@@@ -774,15 -773,15 +774,15 @@@ void BKE_animdata_main_cb(Main *mainptr
                } \
                if (adt) func(id, adt, user_data); \
        } (void)0
 -      
 +
        /* nodes */
        ANIMDATA_IDS_CB(mainptr->nodetree.first);
 -      
 +              
        /* textures */
        ANIMDATA_NODETREE_IDS_CB(mainptr->tex.first, Tex);
 -      
 +              
        /* lamps */
-       ANIMDATA_IDS_CB(mainptr->lamp.first);
+       ANIMDATA_NODETREE_IDS_CB(mainptr->lamp.first, Lamp);
        
        /* materials */
        ANIMDATA_NODETREE_IDS_CB(mainptr->mat.first, Material);
@@@ -914,15 -910,12 +914,15 @@@ void BKE_all_animdata_fix_paths_rename(
        RENAMEFIX_ANIM_IDS(mainptr->mask.first);
        
        /* worlds */
-       RENAMEFIX_ANIM_IDS(mainptr->world.first);
+       RENAMEFIX_ANIM_NODETREE_IDS(mainptr->world.first, World);
        
 +      /* linestyles */
 +      RENAMEFIX_ANIM_IDS(mainptr->linestyle.first);
 +      
        /* scenes */
        RENAMEFIX_ANIM_NODETREE_IDS(mainptr->scene.first, Scene);
 -}
 -
 +              }
 +              
  /* *********************************** */ 
  /* KeyingSet API */
  
Simple merge
index de79a290cb3e3bd35c80a5043f7ea2c6779095d3,fa5d5806bb886d6959e72ee5f013c6ed6eece9b3..d0189e0f5b4ec87ba60434472777e46769849277
@@@ -1952,20 -1955,17 +1961,30 @@@ void init_userdef_do_versions(void
                                rgba_char_args_set(btheme->tv3d.skin_root, 180, 77, 77, 255);
                }
        }
+       
+       if (bmain->versionfile < 264 || (bmain->versionfile == 264 && bmain->subversionfile < 9)) {
+               bTheme *btheme;
+               
+               for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+                       rgba_char_args_set(btheme->tui.xaxis, 220,   0,   0, 255);
+                       rgba_char_args_set(btheme->tui.yaxis,   0, 220,   0, 255);
+                       rgba_char_args_set(btheme->tui.zaxis,   0,   0, 220, 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;
index 3e985a9779cd3fd2a2f1aa6fb76f99872a212e1d,92ad0742ec95a84c670ddcabf87ea22c8158a7f7..c2f2e97b86ab327e168a24f940f95a801e988ffa
@@@ -1239,21 -1245,12 +1247,15 @@@ static void edgetag_context_set(BMesh *
                case EDGE_MODE_TAG_SHARP:
                        BM_elem_flag_set(e, BM_ELEM_SMOOTH, !val);
                        break;
 +              case EDGE_MODE_TAG_FREESTYLE:
 +                      BM_elem_flag_set(e, BM_ELEM_FREESTYLE, val);
 +                      break;
                case EDGE_MODE_TAG_CREASE:
-               {
-                       float *crease = CustomData_bmesh_get(&em->bm->edata, e->head.data, CD_CREASE);
-                       *crease = (val) ? 1.0f : 0.0f;
+                       BM_elem_float_data_set(&bm->edata, e, CD_CREASE, (val) ? 1.0f : 0.0f);
                        break;
-               }
                case EDGE_MODE_TAG_BEVEL:
-               {
-                       float *bweight = CustomData_bmesh_get(&em->bm->edata, e->head.data, CD_BWEIGHT);
-                       *bweight = (val) ? 1.0f : 0.0f;
+                       BM_elem_float_data_set(&bm->edata, e, CD_BWEIGHT, (val) ? 1.0f : 0.0f);
                        break;
-               }
        }
  }
  
@@@ -1266,12 -1263,10 +1268,12 @@@ static int edgetag_context_check(Scene 
                        return BM_elem_flag_test(e, BM_ELEM_SEAM);
                case EDGE_MODE_TAG_SHARP:
                        return !BM_elem_flag_test(e, BM_ELEM_SMOOTH);
 +              case EDGE_MODE_TAG_FREESTYLE:
 +                      return !BM_elem_flag_test(e, BM_ELEM_FREESTYLE);
                case EDGE_MODE_TAG_CREASE:
-                       return BM_elem_float_data_get(&em->bm->edata, e, CD_CREASE) ? 1 : 0;
+                       return BM_elem_float_data_get(&bm->edata, e, CD_CREASE) ? TRUE : FALSE;
                case EDGE_MODE_TAG_BEVEL:
-                       return BM_elem_float_data_get(&em->bm->edata, e, CD_BWEIGHT) ? 1 : 0;
+                       return BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT) ? TRUE : FALSE;
        }
        return 0;
  }
index facddd8c71848ac27ed290f2f0487e4bfa8c0260,251e6a7eb4eec240f9b9d5e8744c760f2388bfa9..c9e00e5f5452a8b4873f4cf42fd9b0b6131c71ce
@@@ -1196,12 -1187,12 +1196,13 @@@ typedef struct Scene 
                /* Use the same flag for autothreads */
  #define R_FIXED_THREADS               0x80000 
  
- #define R_SPEED                       0x100000
- #define R_SSS                 0x200000
- #define R_NO_OVERWRITE        0x400000 /* skip existing files */
- #define R_TOUCH                       0x800000 /* touch files before rendering */
- #define R_SIMPLIFY            0x1000000
+ #define R_SPEED                               0x100000
+ #define R_SSS                         0x200000
+ #define R_NO_OVERWRITE                0x400000  /* skip existing files */
+ #define R_TOUCH                               0x800000  /* touch files before rendering */
+ #define R_SIMPLIFY                    0x1000000
+ #define R_PERSISTENT_DATA     0x2000000 /* keep data around for re-render */
 +#define R_EDGE_FRS            0x2000000 /* R_EDGE for Freestyle */
  
  /* seq_flag */
  #define R_SEQ_GL_PREV 1
index 516f619d910a12ea3df3295ee9bcc969a16ced2f,5e4eb526b767990ca17d92dc0562fd63a4b25702..6011af2626e9b01dc688291d0fb2d7b69fde36d1
@@@ -4483,17 -4042,12 +4489,23 @@@ static void rna_def_scene_render_data(B
        RNA_def_property_boolean_sdna(prop, NULL, "simplify_flag", R_SIMPLE_NO_TRIANGULATE);
        RNA_def_property_ui_text(prop, "Skip Quad to Triangles", "Disable non-planar quads being triangulated");
  
+       /* persistent data */
+       prop = RNA_def_property(srna, "use_persistent_data", PROP_BOOLEAN, PROP_NONE);
+       RNA_def_property_boolean_sdna(prop, NULL, "mode", R_PERSISTENT_DATA);
+       RNA_def_property_ui_text(prop, "Persistent Data", "Keep render data around for faster re-renders");
+       RNA_def_property_update(prop, 0, "rna_Scene_use_persistent_data_update");
 +      /* Freestyle line thickness options */
 +      prop = RNA_def_property(srna, "line_thickness_mode", PROP_ENUM, PROP_NONE);
 +      RNA_def_property_enum_sdna(prop, NULL, "line_thickness_mode");
 +      RNA_def_property_enum_items(prop, freestyle_thickness_items);
 +      RNA_def_property_ui_text(prop, "Line Thickness Mode", "Line thickness mode for Freestyle line drawing");
 +
 +      prop = RNA_def_property(srna, "unit_line_thickness", PROP_FLOAT, PROP_NONE);
 +      RNA_def_property_float_sdna(prop, NULL, "unit_line_thickness");
 +      RNA_def_property_range(prop, 0.f, 10000.f);
 +      RNA_def_property_ui_text(prop, "Unit Line Thickness", "Unit line thickness in pixels");
 +
        /* Scene API */
        RNA_api_scene_render(srna);
  }
Simple merge