Cycles:
authorThomas Dinges <blender@dingto.org>
Mon, 12 Sep 2011 11:59:13 +0000 (11:59 +0000)
committerThomas Dinges <blender@dingto.org>
Mon, 12 Sep 2011 11:59:13 +0000 (11:59 +0000)
* Remove RE_DO_RENDERED again, check for view_draw callback is sufficient.

intern/cycles/blender/addon/__init__.py
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_space.c
source/blender/render/extern/include/RE_engine.h

index 8688e678f86cf369177be06b3f63e202b9ae03f4..3ff1a8f3d41013f9bbf2929e370f4d388c409e87 100644 (file)
@@ -40,7 +40,6 @@ from cycles import presets
 class CyclesRender(bpy.types.RenderEngine):
     bl_idname = 'CYCLES'
     bl_label = "Cycles"
-    bl_use_rendered = True
 
     def __init__(self):
         engine.init()
index 0933dafcf2236180ae1fdafc1fbde209dfc863a6..4337f3c4de6aa5ca84f1a161e9db57f757d63f05 100644 (file)
@@ -402,10 +402,6 @@ static void rna_def_render_engine(BlenderRNA *brna)
        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);
 }
index b3a40ccef3c7c233656eb2f893b0d82fa3e9dc28..651fb848f4c4b12da0e6c270d8748a32b6050b10 100644 (file)
@@ -464,7 +464,7 @@ static EnumPropertyItem *rna_SpaceView3D_viewport_shade_itemf(bContext *UNUSED(C
        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);
        }
 
index 97e789e85601f29d24f5dd5fce7b975ef157bd95..7f01bc673d24ee7116fe4a1c9af8cbbe9deea573 100644 (file)
@@ -52,7 +52,6 @@ struct Scene;
 #define RE_GAME                                2
 #define RE_DO_PREVIEW          4
 #define RE_DO_ALL                      8
-#define RE_DO_RENDERED                 16
 
 extern ListBase R_engines;