[Bf-blender-cvs] [08862b8246b] blender2.8: Render API: rename some API functions back to earlier names.
Brecht Van Lommel
noreply at git.blender.org
Wed May 30 18:26:59 CEST 2018
Commit: 08862b8246b49331ddfb7ed6812c9e31989bf8b1
Author: Brecht Van Lommel
Date: Wed May 30 14:32:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB08862b8246b49331ddfb7ed6812c9e31989bf8b1
Render API: rename some API functions back to earlier names.
Their purpose is the same, no reason to break API compatibility here.
===================================================================
M intern/cycles/blender/addon/__init__.py
M source/blender/blenkernel/intern/scene.c
M source/blender/draw/engines/external/external_engine.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/makesrna/intern/rna_render.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/intern/source/external_engine.c
===================================================================
diff --git a/intern/cycles/blender/addon/__init__.py b/intern/cycles/blender/addon/__init__.py
index 353f2a1ad5b..6e64ed609b7 100644
--- a/intern/cycles/blender/addon/__init__.py
+++ b/intern/cycles/blender/addon/__init__.py
@@ -78,7 +78,7 @@ class CyclesRender(bpy.types.RenderEngine):
engine.reset(self, data, depsgraph)
- def render_to_image(self, depsgraph):
+ def render(self, depsgraph):
engine.render(self, depsgraph)
def bake(self, depsgraph, obj, pass_type, pass_filter, object_id, pixel_array, num_pixels, depth, result):
@@ -93,7 +93,7 @@ class CyclesRender(bpy.types.RenderEngine):
engine.reset(self, context.blend_data, context.depsgraph)
engine.sync(self, context.depsgraph, context.blend_data)
- def render_to_view(self, context):
+ def view_draw(self, context):
engine.draw(self, context.depsgraph, context.region, context.space_data, context.region_data)
def update_script_node(self, node):
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 95a8c454b7a..5de352b3f47 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1293,7 +1293,7 @@ static bool check_rendered_viewport_visible(Main *bmain)
Scene *scene = window->scene;
RenderEngineType *type = RE_engines_find(scene->r.engine);
- if (type->draw_engine || !type->render_to_view) {
+ if (type->draw_engine || !type->render) {
continue;
}
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index 420209279ad..2917805d233 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -153,7 +153,7 @@ static void external_draw_scene_do(void *vedata)
if (!rv3d->render_engine) {
RenderEngineType *engine_type = draw_ctx->engine_type;
- if (!(engine_type->view_update && engine_type->render_to_view)) {
+ if (!(engine_type->view_update && engine_type->view_draw)) {
return;
}
@@ -170,7 +170,7 @@ static void external_draw_scene_do(void *vedata)
/* Render result draw. */
type = rv3d->render_engine->type;
- type->render_to_view(rv3d->render_engine, draw_ctx->evil_C);
+ type->view_draw(rv3d->render_engine, draw_ctx->evil_C);
gpuPopProjectionMatrix();
diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index 4e44c9b1185..9c56f4f7754 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -314,7 +314,7 @@ static int screen_render_exec(bContext *C, wmOperator *op)
struct Object *camera_override = v3d ? V3D_CAMERA_LOCAL(v3d) : NULL;
/* Cannot do render if there is not this function. */
- if (re_type->render_to_image == NULL) {
+ if (re_type->render == NULL) {
return OPERATOR_CANCELLED;
}
@@ -883,7 +883,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *even
ScrArea *sa;
/* Cannot do render if there is not this function. */
- if (re_type->render_to_image == NULL) {
+ if (re_type->render == NULL) {
return OPERATOR_CANCELLED;
}
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 8505de4c7e0..3a89c910ea8 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -1032,7 +1032,7 @@ void ED_scene_draw_fps(Scene *scene, const rcti *rect)
static bool view3d_main_region_do_render_draw(const Scene *scene)
{
RenderEngineType *type = RE_engines_find(scene->r.engine);
- return (type && type->view_update && type->render_to_view);
+ return (type && type->view_update && type->view_draw);
}
bool ED_view3d_calc_render_border(const Scene *scene, Depsgraph *depsgraph, View3D *v3d, ARegion *ar, rcti *rect)
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 18e29a2de3f..fe12e1cd528 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -168,15 +168,15 @@ static void engine_update(RenderEngine *engine, Main *bmain, Depsgraph *depsgrap
RNA_parameter_list_free(&list);
}
-static void engine_render_to_image(RenderEngine *engine, Depsgraph *depsgraph)
+static void engine_render(RenderEngine *engine, Depsgraph *depsgraph)
{
- extern FunctionRNA rna_RenderEngine_render_to_image_func;
+ extern FunctionRNA rna_RenderEngine_render_func;
PointerRNA ptr;
ParameterList list;
FunctionRNA *func;
RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
- func = &rna_RenderEngine_render_to_image_func;
+ func = &rna_RenderEngine_render_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "depsgraph", &depsgraph);
@@ -230,15 +230,15 @@ static void engine_view_update(RenderEngine *engine, const struct bContext *cont
RNA_parameter_list_free(&list);
}
-static void engine_render_to_view(RenderEngine *engine, const struct bContext *context)
+static void engine_view_draw(RenderEngine *engine, const struct bContext *context)
{
- extern FunctionRNA rna_RenderEngine_render_to_view_func;
+ extern FunctionRNA rna_RenderEngine_view_draw_func;
PointerRNA ptr;
ParameterList list;
FunctionRNA *func;
RNA_pointer_create(NULL, engine->type->ext.srna, engine, &ptr);
- func = &rna_RenderEngine_render_to_view_func;
+ func = &rna_RenderEngine_view_draw_func;
RNA_parameter_list_create(&list, &ptr, func);
RNA_parameter_set_lookup(&list, "context", &context);
@@ -344,10 +344,10 @@ static StructRNA *rna_RenderEngine_register(
RNA_struct_blender_type_set(et->ext.srna, et);
et->update = (have_function[0]) ? engine_update : NULL;
- et->render_to_image = (have_function[1]) ? engine_render_to_image : NULL;
+ et->render = (have_function[1]) ? engine_render : NULL;
et->bake = (have_function[2]) ? engine_bake : NULL;
et->view_update = (have_function[3]) ? engine_view_update : NULL;
- et->render_to_view = (have_function[4]) ? engine_render_to_view : NULL;
+ et->view_draw = (have_function[4]) ? engine_view_draw : NULL;
et->update_script_node = (have_function[5]) ? engine_update_script_node : NULL;
et->update_render_passes = (have_function[6]) ? engine_update_render_passes : NULL;
@@ -489,7 +489,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
RNA_def_pointer(func, "data", "BlendData", "", "");
RNA_def_pointer(func, "depsgraph", "Depsgraph", "", "");
- func = RNA_def_function(srna, "render_to_image", NULL);
+ func = RNA_def_function(srna, "render", NULL);
RNA_def_function_ui_description(func, "Render scene into an image");
RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL | FUNC_ALLOW_WRITE);
parm = RNA_def_pointer(func, "depsgraph", "Depsgraph", "", "");
@@ -524,7 +524,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL | FUNC_ALLOW_WRITE);
RNA_def_pointer(func, "context", "Context", "", "");
- func = RNA_def_function(srna, "render_to_view", NULL);
+ func = RNA_def_function(srna, "view_draw", NULL);
RNA_def_function_ui_description(func, "Draw viewport render");
RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL);
RNA_def_pointer(func, "context", "Context", "", "");
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index a8d32bbf6c2..26cb2241ea5 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -656,7 +656,7 @@ static int rna_3DViewShading_type_get(PointerRNA *ptr)
View3D *v3d = (View3D *)ptr->data;
if (!BKE_scene_uses_blender_eevee(scene) && v3d->drawtype == OB_RENDER) {
- if (!(type && type->render_to_view)) {
+ if (!(type && type->view_draw)) {
return OB_MATERIAL;
}
}
@@ -693,7 +693,7 @@ static const EnumPropertyItem *rna_3DViewShading_type_itemf(
}
else {
RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_type_items, OB_MATERIAL);
- if (type && type->render_to_view) {
+ if (type && type->view_draw) {
RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_type_items, OB_RENDER);
}
}
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index 59a754fcde4..3cf048e21ba 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -93,14 +93,14 @@ typedef struct RenderEngineType {
int flag;
void (*update)(struct RenderEngine *engine, struct Main *bmain, struct Depsgraph *depsgraph);
- void (*render_to_image)(struct RenderEngine *engine, struct Depsgraph *depsgraph);
+ void (*render)(struct RenderEngine *engine, struct Depsgraph *depsgraph);
void (*bake)(struct RenderEngine *engine, struct Depsgraph *depsgraph,
struct Object *object, const int pass_type,
const int pass_filter, const int object_id, const struct BakePixel *pixel_array, const int num_pixels,
const int depth, void *result);
void (*view_update)(struct RenderEngine *engine, const struct bContext *context);
- void (*render_to_view)(struct RenderEngine *engine, const struct bContext *context);
+ void (*view_draw)(struct RenderEngine *engine, const struct bContext *context);
void (*update_script_node)(struct RenderEngine *engine, struct bNodeTree *ntree, struct bNode *node);
void (*update_render_passes)(struct RenderEngine *engine, struct Scene *scene, struct ViewLayer *view_layer);
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 7655645f1e7..afdb8c5dd65 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -122,7 +122,7 @@ RenderEngineType *RE_engines_find(const char *idname)
bool RE_engine_is_external(Render *re)
{
- return (re->engine && re->engine->type && re->engine->type->render_to_image);
+ return (re->engine && re->engine->type && re->engine-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list