[Bf-blender-cvs] [ddb2a36] HMD_viewport: Merge branch 'master' into HMD_viewport
Julian Eisel
noreply at git.blender.org
Sun Oct 9 01:24:42 CEST 2016
Commit: ddb2a36a4d80744759b14a51203f016d44448b5f
Author: Julian Eisel
Date: Sat Oct 8 23:06:51 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rBddb2a36a4d80744759b14a51203f016d44448b5f
Merge branch 'master' into HMD_viewport
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_blender_version.h
index 3ae01d8,5514251..908e6f2
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -28,7 -28,7 +28,7 @@@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 278
- #define BLENDER_SUBVERSION 0
-#define BLENDER_SUBVERSION 1
++#define BLENDER_SUBVERSION 2
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 6
diff --cc source/blender/blenloader/intern/versioning_270.c
index 6064970,0d4ff00..ca93d2d
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1392,13 -1393,36 +1393,45 @@@ 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;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ {
+ if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "char", "hmd_view_shade")) {
+ for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ scene->r.hmd_view_shade = OB_MATERIAL;
+ scene->r.hmd_fx_flags |= GPU_FX_FLAG_LensDist;
+ }
+ }
+ }
}
diff --cc source/blender/editors/interface/resources.c
index c422655,79fa7a7..57df50c
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2734,10 -2738,14 +2738,18 @@@ void init_userdef_do_versions(void
}
}
- if (!USER_VERSION_ATLEAST(277, 2)) {
+ if (!USER_VERSION_ATLEAST(278, 1)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ rgba_char_args_set(btheme->tv3d.vertex_bevel, 0, 165, 255, 255);
+ rgba_char_args_set(btheme->tv3d.edge_bevel, 0, 165, 255, 255);
+ }
+ }
+
++ if (!USER_VERSION_ATLEAST(278, 2)) {
+ U.hmd_device = -1;
+ }
+
/**
* Include next version bump.
*
diff --cc source/blender/makesrna/intern/rna_camera.c
index 9b68fcb,078ba13..7b509aa
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@@ -42,22 -42,6 +42,22 @@@
#include "BKE_object.h"
#include "BKE_depsgraph.h"
+#include "WM_api.h"
+
- static int rna_camera_stereo_use_device_ipd_editeable(PointerRNA *ptr)
++static int rna_camera_stereo_use_device_ipd_editeable(PointerRNA *ptr, const char **UNUSED(r_info))
+{
+#ifdef WITH_INPUT_HMD
+ if (U.hmd_device == -1 || WM_device_HMD_IPD_get() == -1) {
+ Camera *cam = ptr->id.data;
+ cam->stereo.flag |= CAM_S3D_CUSTOM_IPD;
+ return false;
+ }
+#else
+ UNUSED_VARS(ptr);
+#endif
+ return PROP_EDITABLE;
+}
+
static float rna_Camera_angle_get(PointerRNA *ptr)
{
Camera *cam = ptr->id.data;
More information about the Bf-blender-cvs
mailing list