[Bf-blender-cvs] [bcc3cb7] multiview: From review: Rename RE_engine_actview_set > RE_engine_active_view_set
Dalai Felinto
noreply at git.blender.org
Mon Mar 23 19:32:57 CET 2015
Commit: bcc3cb7a759b4243fe8d56fb52d63c9cf02767c6
Author: Dalai Felinto
Date: Mon Mar 23 18:07:37 2015 +0100
Branches: multiview
https://developer.blender.org/rBbcc3cb7a759b4243fe8d56fb52d63c9cf02767c6
>From review: Rename RE_engine_actview_set > RE_engine_active_view_set
===================================================================
M source/blender/makesrna/intern/rna_render.c
M source/blender/render/extern/include/RE_engine.h
M source/blender/render/intern/source/external_engine.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 910f762..20e23b0 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -498,7 +498,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
prop = RNA_def_boolean(func, "do_break", 0, "Break", "");
RNA_def_function_return(func, prop);
- func = RNA_def_function(srna, "active_view_set", "RE_engine_actview_set");
+ func = RNA_def_function(srna, "active_view_set", "RE_engine_active_view_set");
RNA_def_string(func, "view", NULL, 0, "View", "Single view to set as active"); /* NULL ok here */
RNA_def_property_flag(prop, PROP_REQUIRED);
diff --git a/source/blender/render/extern/include/RE_engine.h b/source/blender/render/extern/include/RE_engine.h
index 22fd4f6..277e8c6 100644
--- a/source/blender/render/extern/include/RE_engine.h
+++ b/source/blender/render/extern/include/RE_engine.h
@@ -139,7 +139,7 @@ struct RenderResult *RE_engine_begin_result(RenderEngine *engine, int x, int y,
void RE_engine_update_result(RenderEngine *engine, struct RenderResult *result);
void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int merge_results);
-void RE_engine_actview_set(RenderEngine *engine, const char *viewname);
+void RE_engine_active_view_set(RenderEngine *engine, const char *viewname);
float RE_engine_get_camera_shift_x(RenderEngine *engine, struct Object *camera);
void RE_engine_get_camera_model_matrix(RenderEngine *engine, struct Object *camera, float *r_modelmat);
diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 45b0395..5527cd4 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -369,7 +369,7 @@ void RE_engine_set_error_message(RenderEngine *engine, const char *msg)
}
}
-void RE_engine_actview_set(RenderEngine *engine, const char *viewname)
+void RE_engine_active_view_set(RenderEngine *engine, const char *viewname)
{
Render *re = engine->re;
RE_SetActiveRenderView(re, viewname);
More information about the Bf-blender-cvs
mailing list