diff options
| -rw-r--r-- | intern/cycles/blender/addon/__init__.py | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 | ||||
| -rw-r--r-- | source/blender/render/extern/include/RE_engine.h | 1 |
4 files changed, 1 insertions, 7 deletions
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py index 8688e678f86..3ff1a8f3d41 100644 --- a/intern/cycles/blender/addon/__init__.py +++ b/intern/cycles/blender/addon/__init__.py @@ -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() diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 0933dafcf22..4337f3c4de6 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -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); } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index b3a40ccef3c..651fb848f4c 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -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); } diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h index 97e789e8560..7f01bc673d2 100644 --- a/source/blender/render/extern/include/RE_engine.h +++ b/source/blender/render/extern/include/RE_engine.h @@ -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; |