[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40161] branches/cycles: Cycles:

[Thomas Dinges]

Revision: 40161
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40161
Author:   dingto
Date:     2011-09-12 11:59:13 +0000 (Mon, 12 Sep 2011)
Log Message:
-----------
Cycles:
* Remove RE_DO_RENDERED again, check for view_draw callback is sufficient. 

Modified Paths:
--------------
    branches/cycles/intern/cycles/blender/addon/__init__.py
    branches/cycles/source/blender/makesrna/intern/rna_render.c
    branches/cycles/source/blender/makesrna/intern/rna_space.c
    branches/cycles/source/blender/render/extern/include/RE_engine.h

Modified: branches/cycles/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/__init__.py	2011-09-12 10:57:41 UTC (rev 40160)
+++ branches/cycles/intern/cycles/blender/addon/__init__.py	2011-09-12 11:59:13 UTC (rev 40161)
@@ -40,7 +40,6 @@
 class CyclesRender(bpy.types.RenderEngine):
     bl_idname = 'CYCLES'
     bl_label = "Cycles"
-    bl_use_rendered = True
 
     def __init__(self):
         engine.init()

Modified: branches/cycles/source/blender/makesrna/intern/rna_render.c
===================================================================
--- branches/cycles/source/blender/makesrna/intern/rna_render.c	2011-09-12 10:57:41 UTC (rev 40160)
+++ branches/cycles/source/blender/makesrna/intern/rna_render.c	2011-09-12 11:59:13 UTC (rev 40161)
@@ -402,10 +402,6 @@
 	prop= RNA_def_property(srna, "bl_use_postprocess", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "type->flag", RE_DO_ALL);
 	RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
-	
-	prop= RNA_def_property(srna, "bl_use_rendered", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "type->flag", RE_DO_RENDERED);
-	RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
 
 	RNA_define_verify_sdna(1);
 }

Modified: branches/cycles/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/cycles/source/blender/makesrna/intern/rna_space.c	2011-09-12 10:57:41 UTC (rev 40160)
+++ branches/cycles/source/blender/makesrna/intern/rna_space.c	2011-09-12 11:59:13 UTC (rev 40161)
@@ -464,7 +464,7 @@
 	RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_TEXTURE);
 	RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_MATERIAL);
 	
-	if(type->flag & RE_DO_RENDERED) {
+	if(type->view_draw) {
 		RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_RENDER);
 	}
 

Modified: branches/cycles/source/blender/render/extern/include/RE_engine.h
===================================================================
--- branches/cycles/source/blender/render/extern/include/RE_engine.h	2011-09-12 10:57:41 UTC (rev 40160)
+++ branches/cycles/source/blender/render/extern/include/RE_engine.h	2011-09-12 11:59:13 UTC (rev 40161)
@@ -52,7 +52,6 @@
 #define RE_GAME				2
 #define RE_DO_PREVIEW		4
 #define RE_DO_ALL			8
-#define RE_DO_RENDERED 		16
 
 extern ListBase R_engines;