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

[Julian Eisel]

Commit: 48b38797c61daed4b13b55e733cbf7b9bc757a8b
Author: Julian Eisel
Date:   Sun Nov 20 19:32:02 2016 +0100
Branches: HMD_viewport
https://developer.blender.org/rB48b38797c61daed4b13b55e733cbf7b9bc757a8b

Merge branch 'master' into HMD_viewport

Conflicts:
	source/blender/makesrna/intern/rna_userdef.c

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



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

diff --cc source/blender/makesrna/intern/rna_userdef.c
index 6fe2fc4,ffdc5bb..bc703bb
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@@ -4351,44 -4203,13 +4359,52 @@@ static void rna_def_userdef_system(Blen
  	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_PROPERTIES, "rna_userdef_opensubdiv_update");
  #endif
  
+ #ifdef WITH_CYCLES
+ 	prop = RNA_def_property(srna, "legacy_compute_device_type", PROP_INT, PROP_NONE);
+ 	RNA_def_property_int_sdna(prop, NULL, "compute_device_type");
+ 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
+ 	RNA_def_property_flag(prop, PROP_HIDDEN);
+ 	RNA_def_property_ui_text(prop, "Legacy Compute Device Type", "For backwards compatibility only");
+ #endif
++
 +#ifdef WITH_INPUT_HMD
 +	prop = RNA_def_property(srna, "hmd_device", PROP_ENUM, PROP_NONE);
 +	RNA_def_property_flag(prop, PROP_ENUM_NO_CONTEXT);
 +	RNA_def_property_enum_sdna(prop, NULL, "hmd_settings.device");
 +	RNA_def_property_enum_items(prop, hmd_device_items);
 +	RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_userdef_hmd_device_itemf");
 +	RNA_def_property_ui_text(prop, "HMD Device", "Device to use for HMD view interaction");
 +	RNA_def_property_update(prop, 0, "rna_userdef_hmd_device_update");
 +
 +	prop = RNA_def_property(srna, "use_hmd_device_ipd", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_sdna(prop, NULL, "hmd_settings.flag", USER_HMD_USE_DEVICE_IPD);
 +	RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_use_hmd_device_ipd_set");
 +	RNA_def_property_ui_text(prop, "IPD from HMD", "Request the interpupillary distance (distance between the "
 +	                         "eye pupil centers) from the HMD driver");
 +	RNA_def_property_editable_func(prop, "rna_userdef_use_hmd_device_ipd_editeable");
 +	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 +
 +	prop = RNA_def_property(srna, "use_hmd_rotation", PROP_BOOLEAN, PROP_NONE);
 +	RNA_def_property_boolean_sdna(prop, NULL, "hmd_settings.flag", USER_HMD_USE_DEVICE_ROT);
 +	RNA_def_property_ui_text(prop, "Rotation from HMD", "Use the rotation of a head mounted display if available");
 +	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_userdef_hmd_camlock_update");
 +
 +	prop = RNA_def_property(srna, "hmd_lensdist_type", PROP_ENUM, PROP_ENUM);
 +	RNA_def_property_flag(prop, PROP_ENUM_NO_CONTEXT);
 +	RNA_def_property_enum_sdna(prop, NULL, "hmd_settings.lensdist_shader");
 +	RNA_def_property_enum_items(prop, hmd_lensdist_type_items);
 +	RNA_def_property_enum_funcs(prop, NULL, "rna_userdef_hmd_lensdist_type_set", NULL);
 +	RNA_def_property_ui_text(prop, "HMD View Lens Distortion", "Draw the HMD viewport using a distorted lens");
 +
 +	prop = RNA_def_property(srna, "hmd_custom_ipd", PROP_FLOAT, PROP_DISTANCE);
 +	RNA_def_property_float_sdna(prop, NULL, "hmd_settings.custom_ipd");
 +	RNA_def_property_float_funcs(prop, NULL, "rna_userdef_hmd_custom_ipd_set", NULL);
 +	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, "Custom IPD", "Set the interpupillary distance (distance between the "
 +	                         "eye pupil centers)");
 +	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 +#endif
  }
  
  static void rna_def_userdef_input(BlenderRNA *brna)