sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles:

Browse Source 
* Remove RE_DO_RENDERED again, check for view_draw callback is sufficient.
This commit is contained in:
Thomas Dinges 2011-09-12 11:59:13 +00:00
parent bf4f793b55
commit c40492205b
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/blender/addon/__init__.py
View File

@ -40,7 +40,6 @@ from cycles import presets
class CyclesRender(bpy.types.RenderEngine): class CyclesRender(bpy.types.RenderEngine):
bl_idname = 'CYCLES' bl_idname = 'CYCLES'
bl_label = "Cycles" bl_label = "Cycles"
bl_use_rendered = True
def __init__(self): def __init__(self):
engine.init() engine.init()

4
source/blender/makesrna/intern/rna_render.c
View 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); 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_boolean_negative_sdna(prop, NULL, "type->flag", RE_DO_ALL);
RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); 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); RNA_define_verify_sdna(1);
} }

2
source/blender/makesrna/intern/rna_space.c
View 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_TEXTURE);
RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_MATERIAL); 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); RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_RENDER);
} }

1
source/blender/render/extern/include/RE_engine.h vendored
View File

@ -52,7 +52,6 @@ struct Scene;
#define RE_GAME 2 #define RE_GAME 2
#define RE_DO_PREVIEW 4 #define RE_DO_PREVIEW 4
#define RE_DO_ALL 8 #define RE_DO_ALL 8
#define RE_DO_RENDERED 16
extern ListBase R_engines; extern ListBase R_engines;