griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: naming

Browse Source
This commit is contained in:
Sergey Sharybin
2017-11-28 15:08:43 +01:00
parent 178ea1f798
commit 08e7b5d348
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_context.h
View File

@@ -254,7 +254,7 @@ struct LayerCollection *CTX_data_layer_collection(const bContext *C);
struct SceneCollection *CTX_data_scene_collection(const bContext *C);
struct ViewLayer *CTX_data_view_layer(const bContext *C);
struct ViewRender *CTX_data_view_render(const bContext *C);
struct RenderEngineType *CTX_data_engine(const bContext *C);
struct RenderEngineType *CTX_data_engine_type(const bContext *C);
struct ToolSettings *CTX_data_tool_settings(const bContext *C);
const char *CTX_data_mode_string(const bContext *C);

4
source/blender/blenkernel/intern/context.c
View File

@@ -947,7 +947,7 @@ ViewRender *CTX_data_view_render(const bContext *C)
}
}
RenderEngineType *CTX_data_engine(const bContext *C)
RenderEngineType *CTX_data_engine_type(const bContext *C)
{
ViewRender *view_render = CTX_data_view_render(C);
return RE_engines_find(view_render->engine_id);
@@ -1269,7 +1269,7 @@ void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx)
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
RenderEngineType *engine_type = CTX_data_engine(C);
RenderEngineType *engine_type = CTX_data_engine_type(C);
DEG_evaluation_context_init_from_scene(eval_ctx,
scene, view_layer, engine_type,
DAG_EVAL_VIEWPORT);

4
source/blender/draw/intern/draw_manager.c
View File

@@ -3226,7 +3226,7 @@ void DRW_notify_view_update(const bContext *C)
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = ar->regiondata;
Scene *scene = DEG_get_evaluated_scene(graph);
RenderEngineType *engine_type = CTX_data_engine(C);
RenderEngineType *engine_type = CTX_data_engine_type(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
if (rv3d->viewport == NULL) {
@@ -3271,7 +3271,7 @@ void DRW_notify_view_update(const bContext *C)
void DRW_draw_view(const bContext *C)
{
struct Depsgraph *graph = CTX_data_depsgraph(C);
RenderEngineType *engine_type = CTX_data_engine(C);
RenderEngineType *engine_type = CTX_data_engine_type(C);
ARegion *ar = CTX_wm_region(C);
View3D *v3d = CTX_wm_view3d(C);

2
source/blender/editors/armature/editarmature_sketch.c
View File

@@ -998,7 +998,7 @@ static int sk_getStrokeSnapPoint(bContext *C, SK_Point *pt, SK_Sketch *sketch, S
* the ideal would be to call this function only at the beginning of the snap operation,
* or at the beginning of the operator itself */
struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0,
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine_type(C), 0,
CTX_wm_region(C), CTX_wm_view3d(C));
float mvalf[2] = {UNPACK2(dd->mval)};

2
source/blender/editors/mesh/editmesh_tools.c
View File

@@ -311,7 +311,7 @@ void EMBM_project_snap_verts(bContext *C, ARegion *ar, BMEditMesh *em)
ED_view3d_init_mats_rv3d(obedit, ar->regiondata);
struct SnapObjectContext *snap_context = ED_transform_snap_object_context_create_view3d(
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0,
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine_type(C), 0,
ar, CTX_wm_view3d(C));
BM_ITER_MESH (eve, &iter, em->bm, BM_VERTS_OF_MESH) {

2
source/blender/editors/space_view3d/view3d_manipulator_ruler.c
View File

@@ -272,7 +272,7 @@ static void ruler_state_set(bContext *C, RulerInfo *ruler_info, int state)
}
else if (state == RULER_STATE_DRAG) {
ruler_info->snap_context = ED_transform_snap_object_context_create_view3d(
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0,
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine_type(C), 0,
ruler_info->ar, CTX_wm_view3d(C));
}
else {

2
source/blender/editors/space_view3d/view3d_ruler.c
View File

@@ -282,7 +282,7 @@ static void ruler_state_set(bContext *C, RulerInfo *ruler_info, int state)
}
else if (state == RULER_STATE_DRAG) {
ruler_info->snap_context = ED_transform_snap_object_context_create_view3d(
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine(C), 0,
CTX_data_main(C), CTX_data_scene(C), CTX_data_view_layer(C), CTX_data_engine_type(C), 0,
ruler_info->ar, CTX_wm_view3d(C));
}
else {

2
source/blender/editors/space_view3d/view3d_select.c
View File

@@ -113,7 +113,7 @@ void view3d_set_viewcontext(bContext *C, ViewContext *vc)
vc->depsgraph = CTX_data_depsgraph(C);
vc->scene = CTX_data_scene(C);
vc->view_layer = CTX_data_view_layer(C);
vc->engine_type = CTX_data_engine(C);
vc->engine_type = CTX_data_engine_type(C);
vc->v3d = CTX_wm_view3d(C);
vc->win = CTX_wm_window(C);
vc->rv3d = CTX_wm_region_view3d(C);

2
source/blender/editors/space_view3d/view3d_walk.c
View File

@@ -515,7 +515,7 @@ static bool initWalkInfo(bContext *C, WalkInfo *walk, wmOperator *op)
walk->ar = CTX_wm_region(C);
walk->scene = CTX_data_scene(C);
walk->view_layer = CTX_data_view_layer(C);
walk->engine_type = CTX_data_engine(C);
walk->engine_type = CTX_data_engine_type(C);
#ifdef NDOF_WALK_DEBUG
puts("\n-- walk begin --");

2
source/blender/editors/transform/transform_generics.c
View File

@@ -1123,7 +1123,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
Object *obedit = CTX_data_edit_object(C);
Object *ob = CTX_data_active_object(C);
bGPdata *gpd = CTX_data_gpencil_data(C);
RenderEngineType *engine_type = CTX_data_engine(C);
RenderEngineType *engine_type = CTX_data_engine_type(C);
PropertyRNA *prop;
t->scene = sce;

4
source/blender/makesrna/intern/rna_context.c
View File

@@ -144,14 +144,14 @@ static PointerRNA rna_Context_view_render_get(PointerRNA *ptr)
static void rna_Context_engine_get(PointerRNA *ptr, char *value)
{
bContext *C = (bContext *)ptr->data;
RenderEngineType *engine_type = CTX_data_engine(C);
RenderEngineType *engine_type = CTX_data_engine_type(C);
strcpy(value, engine_type->idname);
}
static int rna_Context_engine_length(PointerRNA *ptr)
{
bContext *C = (bContext *)ptr->data;
RenderEngineType *engine_type = CTX_data_engine(C);
RenderEngineType *engine_type = CTX_data_engine_type(C);
return strlen(engine_type->idname);
}