Commit: 4f69557528893f8d52cac16f77bac70161aac3e1
Author: Tianwei Shen
Date: Tue Sep 27 00:00:49 2016 +0800
Branches: soc-2016-multiview
https://developer.blender.org/rB4f69557528893f8d52cac16f77bac70161aac3e1
Merge branch 'master' into soc-2016-multiview
- revise code accordingly with the 2.78 release
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 4519c46,0d4ff00..2053edd
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1394,33 -1393,36 +1395,66 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
+
+ if (!MAIN_VERSION_ATLEAST(main, 279, 0)) {
+ if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData",
"int", "ffmpeg_preset")) {
+ for (Scene *scene = main->scene.first; scene; scene =
scene->id.next) {
+ /* "medium" is the preset FFmpeg uses when no
presets are given. */
+ scene->r.ffcodecdata.ffmpeg_preset =
FFM_PRESET_MEDIUM;
+ }
+ }
+ if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData",
"int", "constant_rate_factor")) {
+ for (Scene *scene = main->scene.first; scene; scene =
scene->id.next) {
+ /* fall back to behaviour from before we
introduced CRF for old files */
+ scene->r.ffcodecdata.constant_rate_factor =
FFM_CRF_NONE;
+ }
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna, "SmokeModifierData",
"float", "slice_per_voxel")) {
+ Object *ob;
+ ModifierData *md;
+
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ for (md = ob->modifiers.first; md; md =
md->next) {
+ if (md->type == eModifierType_Smoke) {
+ SmokeModifierData *smd =
(SmokeModifierData *)md;
+ if (smd->domain) {
+
smd->domain->slice_per_voxel = 5.0f;
+
smd->domain->slice_depth = 0.5f;
+
smd->domain->display_thickness = 1.0f;
+ }
+ }
+ }
+ }
+ }
+ }
++
+ {
+ /* initialize regiondata for each SpaceClip, due to the newly
brought RegionSpaceClip */
+ if (!DNA_struct_elem_find(fd->filesdna, "SpaceClip",
"MovieClip", "*secondary_clip")) {
+ for (bScreen *screen = main->screen.first; screen !=
NULL; screen = screen->id.next) {
+ for (ScrArea *sa = screen->areabase.first; sa
!= NULL; sa = sa->next) {
+ for (SpaceLink *sl =
sa->spacedata.first; sl != NULL; sl = sl->next) {
+ if (sl->spacetype ==
SPACE_CLIP) {
+ ListBase *regionbase =
(sl == sa->spacedata.first) ? &sa->regionbase : &sl->regionbase;
+ for (ARegion *ar =
regionbase->first; ar != NULL; ar = ar->next) {
+ if
(ar->regiontype == RGN_TYPE_WINDOW) {
+
SpaceClip *sc = (SpaceClip *)sl;
+
RegionSpaceClip *rsc = MEM_callocN(sizeof(RegionSpaceClip), "region data for
clip");
+
+
rsc->xof = sc->xof;
+
rsc->yof = sc->yof;
+
rsc->xlockof = sc->xlockof;
+
rsc->ylockof = sc->ylockof;
+
rsc->zoom = sc->zoom;
+
rsc->flag = RSC_MAIN_CLIP;
+
ar->regiondata = rsc;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --cc source/blender/editors/include/UI_resources.h
index 50cee5c,f8a5f30..a5ea4e7
--- a/source/blender/editors/include/UI_resources.h
+++ b/source/blender/editors/include/UI_resources.h
@@@ -300,9 -300,8 +300,11 @@@ enum
TH_METADATA_BG,
TH_METADATA_TEXT,
+ TH_EDGE_BEVEL,
- TH_VERTEX_BEVEL
++ TH_VERTEX_BEVEL,
+ /* color theme for linked markers */
+ TH_LINKED_MARKER,
+ TH_SEL_LINKED_MARKER
};
/* XXX WARNING: previous is saved in file, so do not change order! */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
