Commit: 8f025c41e4406678729c4c584ae90966d802eed9
Author: Julian Eisel
Date: Mon Aug 1 02:23:40 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB8f025c41e4406678729c4c584ae90966d802eed9
Merge branch 'master' into HMD_viewport
Conflicts:
intern/ghost/intern/GHOST_System.h
source/blender/blenkernel/intern/camera.c
source/blender/blenkernel/intern/screen.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
===================================================================
===================================================================
diff --cc intern/ghost/intern/GHOST_System.h
index adc0e45,a10259b..2d164a2
--- a/intern/ghost/intern/GHOST_System.h
+++ b/intern/ghost/intern/GHOST_System.h
@@@ -181,10 -180,12 +181,9 @@@ public
***************************************************************************************/
/**
- * Inherited from GHOST_ISystem but left pure virtual
- *
- * virtual bool processEvents(bool waitForEvent) = 0;
+ * Implemented for operating system independent event handling
*/
-
--
+ bool processEvents(bool waitForEvent);
/**
* Dispatches all the events on the stack.
@@@ -340,7 -336,7 +339,7 @@@ protected
* \return Indication of success.
*/
GHOST_TSuccess createFullScreenWindow(GHOST_Window **window, const
GHOST_DisplaySetting &settings,
- const bool stereoVisual,
const GHOST_TUns16 numOfAASamples = 0);
- const bool stereoVisual, const
bool alphaBackground = 0, const GHOST_TUns16 numOfAASamples = 0);
++ const bool stereoVisual, const
bool alphaBackground, const GHOST_TUns16 numOfAASamples = 0);
/** The display manager (platform dependent). */
GHOST_DisplayManager *m_displayManager;
diff --cc source/blender/blenkernel/CMakeLists.txt
index cff7160,b7ff81d..a90e429
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -40,6 -40,6 +40,7 @@@ set(IN
../nodes
../physics
../render/extern/include
++ ../windowmanager # XXX
../../../intern/ghost
../../../intern/guardedalloc
../../../intern/glew-mx
diff --cc source/blender/blenkernel/intern/camera.c
index 789b309,85ce399..da30542
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@@ -55,8 -57,6 +57,8 @@@
#include "GPU_compositing.h"
- #include "WM_api.h"
++#include "WM_api.h" /* XXX */
+
/****************************** Camera Datablock
*****************************/
void BKE_camera_init(Camera *cam)
diff --cc source/blender/blenloader/CMakeLists.txt
index 7c4e52d,479d3a1..a11a291
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@@ -73,8 -77,7 +77,11 @@@ if(WITH_CODEC_FFMPEG
add_definitions(-DWITH_FFMPEG)
endif()
+if(WITH_INPUT_HMD)
+ add_definitions(-DWITH_INPUT_HMD)
+endif()
+
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}")
+
+ # needed so writefile.c can use dna_type_offsets.h
+ add_dependencies(bf_blenloader bf_dna)
diff --cc source/blender/blenloader/intern/versioning_270.c
index 8ec2f11,3e6b0d3..267ebf4
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1212,12 -1212,43 +1212,50 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
+
+ if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData",
"float", "double_threshold")) {
+ Object *ob;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ ModifierData *md;
+ for (md = ob->modifiers.first; md; md =
md->next) {
+ if (md->type == eModifierType_Boolean) {
+ BooleanModifierData *bmd =
(BooleanModifierData *)md;
+ bmd->double_threshold = 1e-6f;
+ }
+ }
+ }
+ }
+
+ for (Brush *br = main->brush.first; br; br = br->id.next) {
+ if (br->sculpt_tool == SCULPT_TOOL_FLATTEN) {
+ br->flag |= BRUSH_ACCUMULATE;
+ }
+ }
+
+ if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings",
"float", "time_scale")) {
+ 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_Cloth) {
+ ClothModifierData *clmd =
(ClothModifierData *)md;
+ clmd->sim_parms->time_scale =
1.0f;
+ }
+ else if (md->type ==
eModifierType_ParticleSystem) {
+ ParticleSystemModifierData *pmd
= (ParticleSystemModifierData *)md;
+ if (pmd->psys->clmd) {
+
pmd->psys->clmd->sim_parms->time_scale = 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 829ba4f,c8ff335..a43ba35
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2699,11 -2725,15 +2725,19 @@@ void init_userdef_do_versions(void
}
}
}
+
+ if (!USER_VERSION_ATLEAST(277, 2)) {
+ bTheme *btheme;
+ for (btheme = U.themes.first; btheme; btheme = btheme->next) {
+ if (btheme->tact.keyframe_scale_fac < 0.1f)
+ btheme->tact.keyframe_scale_fac = 1.0f;
+ }
+ }
+ if (!USER_VERSION_ATLEAST(277, 1)) {
+ U.hmd_device = -1;
+ }
+
/**
* Include next version bump.
*
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
