[Bf-blender-cvs] [56ec0bd] multiview: From review: left over from Dr. Epilepsy mode removal

Dalai Felinto noreply at git.blender.org
Tue Mar 17 15:18:35 CET 2015


Commit: 56ec0bd8715290b2d1ce38e942308e72c8d48d5a
Author: Dalai Felinto
Date:   Tue Mar 17 14:54:45 2015 +0100
Branches: multiview
https://developer.blender.org/rB56ec0bd8715290b2d1ce38e942308e72c8d48d5a

>From review: left over from Dr. Epilepsy mode removal

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

M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 413ec7d..0989620 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -280,12 +280,11 @@ enum {
 };
 
 typedef struct Stereo3dFormat {
-	float epilepsy_interval; /* DEPRECATED - preferred interval in seconds for Dr. Epilepsy stereo method */
 	short flag;
 	char display_mode; /* encoding mode */
 	char anaglyph_type; /* anaglyph scheme for the user display */
 	char interlace_type;  /* interlace type for the user display */
-	char pad[7];
+	char pad[3];
 } Stereo3dFormat;
 
 /* Stereo3dFormat.display_mode */
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 4405df5..892ca58 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1779,11 +1779,6 @@ static void rna_def_window_stereo3d(BlenderRNA *brna)
 	RNA_def_property_enum_items(prop, stereo3d_interlace_type_items);
 	RNA_def_property_ui_text(prop, "Interlace Type", "");
 
-	prop = RNA_def_property(srna, "epilepsy_interval", PROP_FLOAT, PROP_TIME);
-	RNA_def_property_range(prop, 0.01f, 10.0f);
-	RNA_def_property_ui_range(prop, 0.05f, 1.0f, 1.0f, 2);
-	RNA_def_property_ui_text(prop, "Interval", "Preferred interval in seconds between switching left/right views");
-
 	prop = RNA_def_property(srna, "use_interlace_swap", PROP_BOOLEAN, PROP_BOOLEAN);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", S3D_INTERLACE_SWAP);
 	RNA_def_property_ui_text(prop, "Swap Left/Right", "Swap left and right stereo channels");
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 74b487f..956df85 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4859,9 +4859,6 @@ static void WM_OT_set_stereo3d(wmOperatorType *ot)
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 	prop = RNA_def_enum(ot->srna, "interlace_type", stereo3d_interlace_type_items, S3D_INTERLACE_ROW, "Interlace Type", "");
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
-	prop = RNA_def_float(ot->srna, "epilepsy_interval", 0.1f, 0.01f, 10.0f, "Interval",
-	                     "Preferred interval in seconds between switching left/right views", 0.05f, 1.0f);
-	RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 	prop = RNA_def_boolean(ot->srna, "use_interlace_swap", false, "Swap Left/Right",
 	                       "Swap left and right stereo channels");
 	RNA_def_property_flag(prop, PROP_SKIP_SAVE);




More information about the Bf-blender-cvs mailing list