Commit: aef4519c8aba3b9c7c3037b532f72dceb0be9092
Author: Dalai Felinto
Date: Tue Apr 11 16:09:30 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBaef4519c8aba3b9c7c3037b532f72dceb0be9092
Renaming: sl > scene_layer
===================================================================
M source/blender/editors/armature/armature_select.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_paint.c
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_snap.c
===================================================================
diff --git a/source/blender/editors/armature/armature_select.c
b/source/blender/editors/armature/armature_select.c
index b78adba408c..8db1cb7d6c0 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -180,7 +180,7 @@ void *get_nearest_bone(bContext *C, const int xy[2], bool
findunsel)
hits = view3d_opengl_select(&vc, buffer, MAXPICKBUF, &rect,
VIEW3D_SELECT_PICK_NEAREST);
if (hits > 0)
- return get_bone_from_selectbuffer(vc.scene, vc.sl->basact,
buffer, hits, findunsel, true);
+ return get_bone_from_selectbuffer(vc.scene,
vc.scene_layer->basact, buffer, hits, findunsel, true);
return NULL;
}
diff --git a/source/blender/editors/curve/editcurve.c
b/source/blender/editors/curve/editcurve.c
index 09dcdfc35bd..57805f92c8a 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -5015,7 +5015,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op,
const wmEvent *event)
const float mval[2] = {UNPACK2(event->mval)};
struct SnapObjectContext *snap_context =
ED_transform_snap_object_context_create_view3d(
- CTX_data_main(C), vc.scene, vc.sl, 0,
+ CTX_data_main(C), vc.scene, vc.scene_layer, 0,
vc.ar, vc.v3d);
ED_transform_snap_object_project_view3d_mixed(
diff --git a/source/blender/editors/curve/editcurve_paint.c
b/source/blender/editors/curve/editcurve_paint.c
index 7212496a2cc..eb6e3074cab 100644
--- a/source/blender/editors/curve/editcurve_paint.c
+++ b/source/blender/editors/curve/editcurve_paint.c
@@ -700,7 +700,7 @@ static bool curve_draw_init(bContext *C, wmOperator *op,
bool is_invoke)
}
else {
cdd->vc.scene = CTX_data_scene(C);
- cdd->vc.sl = CTX_data_scene_layer(C);
+ cdd->vc.scene_layer = CTX_data_scene_layer(C);
cdd->vc.obedit = CTX_data_edit_object(C);
}
diff --git a/source/blender/editors/include/ED_view3d.h
b/source/blender/editors/include/ED_view3d.h
index 319d5afe0f3..ba85e2deb52 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -71,7 +71,7 @@ enum eGPUFXFlags;
/* for derivedmesh drawing callbacks, for view3d_select, .... */
typedef struct ViewContext {
struct Scene *scene;
- struct SceneLayer *sl;
+ struct SceneLayer *scene_layer;
struct Object *obact;
struct Object *obedit;
struct ARegion *ar;
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c
b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 14b8f78e4c7..7cd926d180c 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -356,7 +356,7 @@ static void view3d_opengl_read_Z_pixels(ARegion *ar, int x,
int y, int w, int h,
void ED_view3d_backbuf_validate(ViewContext *vc)
{
if (vc->v3d->flag & V3D_INVALID_BACKBUF)
- backdrawview3d(vc->scene, vc->sl, vc->win, vc->ar, vc->v3d);
+ backdrawview3d(vc->scene, vc->scene_layer, vc->win, vc->ar,
vc->v3d);
}
/**
diff --git a/source/blender/editors/space_view3d/view3d_select.c
b/source/blender/editors/space_view3d/view3d_select.c
index e22e89dff12..c53efd02b92 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -110,7 +110,7 @@ void view3d_set_viewcontext(bContext *C, ViewContext *vc)
memset(vc, 0, sizeof(ViewContext));
vc->ar = CTX_wm_region(C);
vc->scene = CTX_data_scene(C);
- vc->sl = CTX_data_scene_layer(C);
+ vc->scene_layer = CTX_data_scene_layer(C);
vc->v3d = CTX_wm_view3d(C);
vc->win = CTX_wm_window(C);
vc->rv3d = CTX_wm_region_view3d(C);
@@ -390,9 +390,9 @@ static void do_lasso_select_objects(ViewContext *vc, const
int mcords[][2], cons
Base *base;
if (extend == false && select)
- object_deselect_all_visible(vc->sl);
+ object_deselect_all_visible(vc->scene_layer);
- for (base = vc->sl->object_bases.first; base; base = base->next) {
+ for (base = vc->scene_layer->object_bases.first; base; base =
base->next) {
if (BASE_SELECTABLE_NEW(base)) { /* use this to avoid un-needed
lasso lookups */
if (ED_view3d_project_base(vc->ar, base) ==
V3D_PROJ_RET_OK) {
if (BLI_lasso_is_point_inside(mcords, moves,
base->sx, base->sy, IS_CLIPPED)) {
@@ -1264,7 +1264,7 @@ finally:
static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer,
int hits,
Base *startbase, bool has_bones, bool
do_nearest)
{
- SceneLayer *sl = vc->sl;
+ SceneLayer *sl = vc->scene_layer;
Base *base, *basact = NULL;
int a;
@@ -1359,7 +1359,7 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const
int mval[2])
if (hits > 0) {
const bool has_bones = selectbuffer_has_bones(buffer, hits);
- basact = mouse_select_eval_buffer(&vc, buffer, hits,
vc.sl->object_bases.first, has_bones, do_nearest);
+ basact = mouse_select_eval_buffer(&vc, buffer, hits,
vc.scene_layer->object_bases.first, has_bones, do_nearest);
}
return basact;
@@ -2019,7 +2019,7 @@ static int do_object_pose_box_select(bContext *C,
ViewContext *vc, rcti *rect, b
CTX_DATA_END;
}
else {
- object_deselect_all_visible(vc->sl);
+ object_deselect_all_visible(vc->scene_layer);
}
}
@@ -2042,7 +2042,7 @@ static int do_object_pose_box_select(bContext *C,
ViewContext *vc, rcti *rect, b
Base *base;
col = vbuffer + 3;
- for (base = vc->sl->object_bases.first; base && hits; base =
base->next) {
+ for (base = vc->scene_layer->object_bases.first; base && hits;
base = base->next) {
if (BASE_SELECTABLE_NEW(base)) {
while (base->selcol == (*col & 0xFFFF)) { /*
we got an object */
if (*col & 0xFFFF0000) {
/* we got a bone */
@@ -2774,7 +2774,7 @@ static void obedit_circle_select(ViewContext *vc, const
bool select, const int m
static bool object_circle_select(ViewContext *vc, const bool select, const int
mval[2], float rad)
{
- SceneLayer *sl = vc->sl;
+ SceneLayer *sl = vc->scene_layer;
const float radius_squared = rad * rad;
const float mval_fl[2] = {mval[0], mval[1]};
bool changed = false;
diff --git a/source/blender/editors/space_view3d/view3d_view.c
b/source/blender/editors/space_view3d/view3d_view.c
index c9fb2dab5e2..08f8516593f 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -1112,7 +1112,7 @@ int view3d_opengl_select(
eV3DSelectMode select_mode)
{
Scene *scene = vc->scene;
- SceneLayer *sl = vc->sl;
+ SceneLayer *sl = vc->scene_layer;
View3D *v3d = vc->v3d;
ARegion *ar = vc->ar;
rcti rect;
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index 1be4d0c3172..c479203bbeb 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1889,7 +1889,7 @@ static void drawTransformPixel(const struct bContext
*UNUSED(C), ARegion *ar, vo
{
TransInfo *t = arg;
Scene *scene = t->scene;
- SceneLayer *sl = t->sl;
+ SceneLayer *sl = t->scene_layer;
Object *ob = OBACT_NEW;
/* draw autokeyframing hint in the corner
diff --git a/source/blender/editors/transform/transform.h
b/source/blender/editors/transform/transform.h
index 8765169fcb2..5544b08bbe9 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -465,7 +465,7 @@ typedef struct TransInfo {
struct ScrArea *sa;
struct ARegion *ar;
struct Scene *scene;
- struct SceneLayer *sl;
+ struct SceneLayer *scene_layer;
struct ToolSettings *settings;
struct wmTimer *animtimer;
struct wmKeyMap *keymap; /* so we can do lookups for header text */
diff --git a/source/blender/editors/transform/transform_conversions.c
b/source/blender/editors/transform/transform_conversions.c
index c09434a3bc9..9e4c3cdfc7d 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -286,7 +286,7 @@ static void set_prop_dist(TransInfo *t, const bool
with_dist)
static void createTransTexspace(TransInfo *t)
{
- SceneLayer *sl = t->sl;
+ SceneLayer *sl = t->scene_layer;
TransData *td;
Object *ob;
ID *id;
@@ -1800,7 +1800,7 @@ static void createTransParticleVerts(bContext *C,
TransInfo *t)
Base *base = CTX_data_active_base(C);
Object *ob = CTX_data_active_object(C);
ParticleEditSettings *pset = PE_settings(t->scene);
- PTCacheEdit *edit = PE_get_current(t->scene, t->sl, ob);
+ PTCacheEdit *edit = PE_get_current(t->scene, t->scene_layer, ob);
ParticleSystem *psys = NULL;
ParticleSystemModifierData *psmd = NULL;
PTCacheEditPoint *point;
@@ -1917,7 +1917,7 @@ static void createTransParticleVerts(bContext *C,
TransInfo *t)
void flushTransParticles(TransInfo *t)
{
Scene *scene = t->scene;
- SceneLayer *sl = t->sl;
+ SceneLayer *sl = t->scene_layer;
Object *ob = OBACT_NEW;
PTCacheEdit *edit = PE_get_current(scene, sl, ob);
ParticleSystem *psys = edit->psys;
@@ -5438,7 +5438,7 @@ static void ObjectToTransData(TransInfo *t, TransData
*td, Object *ob)
/* it deselects Bases, so we have to call the clear function always after */
static void set_trans_object_base_flags(TransInfo *t)
{
- SceneLayer *sl = t->sl;
+ SceneLayer *sl = t->scene_layer;
/*
* if Base selected and has parent selected:
@@ -5451,7 +5451,7 @@ static void set_trans_object_base_flags(TransInfo *t)
return;
/* makes sure base flags and object flags are identical */
- BKE_scene_base_flag_to_objects(t->sl);
+ BKE_scene_base_flag_to_objects(t->scene_layer);
/* Make sure depsgraph is here. */
DAG_scene_relations_update(G.main, t->scene);
@@ -5528,7 +5528,7 @@ static bool mark_children(Object *ob)
static int count_proportional_objects(TransInfo *t)
{
int total = 0;
- SceneLayer *sl = t->sl;
+ SceneLayer *sl = t->scene_layer;
Base *base;
/* rotations around local centers are allowed to propagate, so we take
all objects */
@@ -5593,7 +5593,7 @@ static int count_proportional_objects(TransInfo *t)
static void clear_trans_object_base_flags(TransInfo *t)
{
- SceneLayer *sl = t->sl;
+ SceneLayer *sl = t->scene_layer;
Base *base;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
