[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51563] trunk/blender/source/blender: comment R_SEQ_GL_REND flag, opengl render now does gl previews.

[Campbell Barton]

Revision: 51563
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51563
Author:   campbellbarton
Date:     2012-10-24 03:37:32 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
comment R_SEQ_GL_REND flag, opengl render now does gl previews.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sequencer.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-10-24 03:35:43 UTC (rev 51562)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2012-10-24 03:37:32 UTC (rev 51563)
@@ -2339,7 +2339,7 @@
 
 	const short is_rendering = G.is_rendering;
 	const int do_seq_gl = G.is_rendering ?
-	            (context.scene->r.seq_flag & R_SEQ_GL_REND) :
+	            0 /* (context.scene->r.seq_flag & R_SEQ_GL_REND) */ :
 	            (context.scene->r.seq_flag & R_SEQ_GL_PREV);
 	int do_seq;
 	int have_seq = FALSE;

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2012-10-24 03:35:43 UTC (rev 51562)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2012-10-24 03:37:32 UTC (rev 51563)
@@ -1188,7 +1188,7 @@
 
 /* seq_flag */
 #define R_SEQ_GL_PREV 1
-#define R_SEQ_GL_REND 2
+// #define R_SEQ_GL_REND 2  // UNUSED, opengl render has its own operator now.
 
 /* displaymode */
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-10-24 03:35:43 UTC (rev 51562)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-10-24 03:37:32 UTC (rev 51563)
@@ -3945,11 +3945,12 @@
 	RNA_def_property_boolean_sdna(prop, NULL, "seq_flag", R_SEQ_GL_PREV);
 	RNA_def_property_ui_text(prop, "Sequencer OpenGL", "");
 
+#if 0  /* see R_SEQ_GL_REND comment */
 	prop = RNA_def_property(srna, "use_sequencer_gl_render", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "seq_flag", R_SEQ_GL_REND);
 	RNA_def_property_ui_text(prop, "Sequencer OpenGL", "");
+#endif
 
-
 	prop = RNA_def_property(srna, "sequencer_gl_preview", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "seq_prev_type");
 	RNA_def_property_enum_items(prop, viewport_shade_items);