[Bf-blender-cvs] [dbd5663] HMD_viewport: Merge branch 'master' into HMD_viewport

[Julian Eisel]

Commit: dbd5663c2619e1159791af0f5f6e71b5db7bad93
Author: Julian Eisel
Date:   Tue Jun 7 20:14:35 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rBdbd5663c2619e1159791af0f5f6e71b5db7bad93

Merge branch 'master' into HMD_viewport

Conflicts:
	build_files/cmake/macros.cmake
	intern/ghost/intern/GHOST_SystemX11.cpp
	source/blender/editors/space_view3d/view3d_ops.c

===================================================================



===================================================================

diff --cc build_files/cmake/macros.cmake
index 679a81a,3aa938b..0c51822
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@@ -451,12 -448,11 +448,15 @@@ function(setup_liblink
  		if(WITH_OPENMP_STATIC)
  			target_link_libraries(${target} ${OpenMP_LIBRARIES})
  		endif()
+ 		if(WITH_INPUT_NDOF)
+ 			target_link_libraries(${target} ${NDOF_LIBRARIES})
+ 		endif()
  	endif()
  
 +	if(WITH_OPENHMD)
 +		target_link_libraries(${target} ${OPENHMD_LIBRARIES} ${HIDAPI_LIBRARY})
 +	endif()
 +
  	# We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them..
  	if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
  		target_link_libraries(${target} "extern_clew")
@@@ -666,14 -661,6 +668,10 @@@ function(SETUP_BLENDER_SORTED_LIBS
  		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
  	endif()
  
- 	if(WITH_INPUT_NDOF)
- 		list(APPEND BLENDER_SORTED_LIBS bf_intern_ghostndof3dconnexion)
- 	endif()
- 
 +	if(WITH_OPENHMD)
 +		list(APPEND BLENDER_SORTED_LIBS extern_openhmd)
 +	endif()
 +	
  	if(WITH_MOD_BOOLEAN)
  		list(APPEND BLENDER_SORTED_LIBS extern_carve)
  	endif()
diff --cc intern/ghost/intern/GHOST_System.cpp
index 7474dd5,639ce45..280513a
--- a/intern/ghost/intern/GHOST_System.cpp
+++ b/intern/ghost/intern/GHOST_System.cpp
@@@ -345,33 -328,23 +345,28 @@@ GHOST_TSuccess GHOST_System::exit(
  	if (getFullScreen()) {
  		endFullScreen();
  	}
- 	if (m_displayManager) {
- 		delete m_displayManager;
- 		m_displayManager = NULL;
- 	}
- 	if (m_windowManager) {
- 		delete m_windowManager;
- 		m_windowManager = NULL;
- 	}
- 	if (m_timerManager) {
- 		delete m_timerManager;
- 		m_timerManager = NULL;
- 	}
- 	if (m_eventManager) {
- 		delete m_eventManager;
- 		m_eventManager = NULL;
- 	}
+ 
+ 	delete m_displayManager;
+ 	m_displayManager = NULL;
+ 
+ 	delete m_windowManager;
+ 	m_windowManager = NULL;
+ 
+ 	delete m_timerManager;
+ 	m_timerManager = NULL;
+ 
+ 	delete m_eventManager;
+ 	m_eventManager = NULL;
+ 
  #ifdef WITH_INPUT_NDOF
- 	if (m_ndofManager) {
- 		delete m_ndofManager;
- 		m_ndofManager = 0;
- 	}
+ 	delete m_ndofManager;
+ 	m_ndofManager = NULL;
  #endif
 +    if (m_openHMDManager) {
 +        delete m_openHMDManager;
 +        m_openHMDManager = NULL;
 +    }
 +
  	return GHOST_kSuccess;
  }
  
diff --cc intern/ghost/intern/GHOST_SystemX11.cpp
index 8ea67ce,c9946c1..3292bc4
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@@ -597,12 -597,9 +597,12 @@@ processEvents
  			anyProcessed = true;
  		}
  #endif
 -		
 +		/* Call base class to update os independent events */
 +		if (GHOST_System::processEvents(anyProcessed)) {
 +			anyProcessed = true;
 +		}
  	} while (waitForEvent && !anyProcessed);
- 
+ 	
  	return anyProcessed;
  }
  
diff --cc source/blender/blenloader/intern/versioning_270.c
index a1251f8,b7b6ace..8ec2f11
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1200,12 -1198,19 +1198,26 @@@ void blo_do_versions_270(FileData *fd, 
  				camera->stereo.pole_merge_angle_to = DEG2RAD(75.0f);
  			}
  		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "NormalEditModifierData", "float", "mix_limit")) {
+ 			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_NormalEdit) {
+ 						NormalEditModifierData *nemd = (NormalEditModifierData *)md;
+ 						nemd->mix_limit = DEG2RADF(180.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/makesrna/intern/rna_camera.c
index f2570ee,678b0ac..c544449
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@@ -130,15 -130,9 +130,15 @@@ static void rna_def_camera_stereo_data(
  	RNA_def_property_ui_text(prop, "Pivot", "");
  	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
  
 +	prop = RNA_def_property(srna, "use_device_ipd", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CAM_S3D_CUSTOM_IPD);
 +	RNA_def_property_ui_text(prop, "Interocular Distance from HMD",
 +	                         "Request the interocular distance (distance between eyes) from the HMD driver");
 +	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 +
  	prop = RNA_def_property(srna, "interocular_distance", PROP_FLOAT, PROP_DISTANCE);
- 	RNA_def_property_range(prop, 0.0f, 100.0f);
- 	RNA_def_property_ui_range(prop, 0.0f, 1.f, 1, 3);
+ 	RNA_def_property_range(prop, 0.0f, FLT_MAX);
+ 	RNA_def_property_ui_range(prop, 0.0f, 1e4f, 1, 3);
  	RNA_def_property_ui_text(prop, "Interocular Distance",
  	                         "Set the distance between the eyes - the stereo plane distance / 30 should be fine");
  	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);