[Bf-blender-cvs] [7defb27f084] blender2.8: Farewell BaseLegacy
Dalai Felinto
noreply at git.blender.org
Thu Nov 9 18:46:40 CET 2017
Commit: 7defb27f084288e0218f068aec74a693a0ca9b6a
Author: Dalai Felinto
Date: Thu Nov 9 15:44:56 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB7defb27f084288e0218f068aec74a693a0ca9b6a
Farewell BaseLegacy
Finally, bases are all using the latest, newest SceneLayer bases.
===================================================================
M source/blender/blenkernel/BKE_group.h
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/scene.c
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/armature/armature_intern.h
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/ED_transform.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/interface/interface_eyedropper.c
M source/blender/editors/mesh/mesh_data.c
M source/blender/editors/mesh/mesh_navmesh.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_select.c
M source/blender/editors/space_view3d/drawarmature.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_object_api.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index 205f42d6643..9aab6950496 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -33,7 +33,6 @@
* \author nzc
*/
-struct BaseLegacy;
struct Base;
struct EvaluationContext;
struct Group;
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index 380da4530b9..14409c77e6d 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -35,7 +35,6 @@ extern "C" {
#include "BLI_compiler_attrs.h"
-struct BaseLegacy;
struct EvaluationContext;
struct Scene;
struct SceneLayer;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index b9a9b6452d9..0062a0a1932 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -38,7 +38,6 @@ extern "C" {
#endif
struct AviCodecData;
-struct BaseLegacy;
struct Depsgraph;
struct EvaluationContext;
struct Main;
@@ -104,7 +103,7 @@ typedef struct SceneBaseIter {
int BKE_scene_base_iter_next(
const struct EvaluationContext *eval_ctx, struct SceneBaseIter *iter,
- struct Scene **scene, int val, struct BaseLegacy **base, struct Object **ob);
+ struct Scene **scene, int val, struct Base **base, struct Object **ob);
void BKE_scene_base_flag_to_objects(struct SceneLayer *scene_layer);
void BKE_scene_base_flag_from_objects(struct Scene *scene);
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index f1e549b1400..f2c39d6cc72 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -320,7 +320,7 @@ bool BKE_mball_is_basis_for(Object *ob1, Object *ob2)
void BKE_mball_properties_copy(Scene *scene, Object *active_object)
{
Scene *sce_iter = scene;
- BaseLegacy *base;
+ Base *base;
Object *ob;
MetaBall *active_mball = (MetaBall *)active_object->data;
int basisnr, obnr;
diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index d8e3df239df..b4eff3f989f 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -1082,7 +1082,7 @@ static void polygonize(PROCESS *process)
static void init_meta(const EvaluationContext *eval_ctx, PROCESS *process, Scene *scene, Object *ob)
{
Scene *sce_iter = scene;
- BaseLegacy *base;
+ Base *base;
Object *bob;
MetaBall *mb;
const MetaElem *ml;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 891aab77b08..b1cbf24f715 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1153,7 +1153,7 @@ Scene *BKE_scene_set_name(Main *bmain, const char *name)
/* Used by metaballs, return *all* objects (including duplis) existing in the scene (including scene's sets) */
int BKE_scene_base_iter_next(
const EvaluationContext *eval_ctx, SceneBaseIter *iter,
- Scene **scene, int val, BaseLegacy **base, Object **ob)
+ Scene **scene, int val, Base **base, Object **ob)
{
bool run_again = true;
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
index e24656ff067..48d0cf76a7f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h
@@ -45,7 +45,6 @@
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_operation.h"
-struct BaseLegacy;
struct bGPdata;
struct CacheFile;
struct ListBase;
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 4f76571a485..9fb30dc8066 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -628,7 +628,7 @@ static bAnimChannelType ACF_SCENE =
static int acf_object_icon(bAnimListElem *ale)
{
- BaseLegacy *base = (BaseLegacy *)ale->data;
+ Base *base = (Base *)ale->data;
Object *ob = base->object;
/* icon depends on object-type */
@@ -663,7 +663,7 @@ static int acf_object_icon(bAnimListElem *ale)
/* name for object */
static void acf_object_name(bAnimListElem *ale, char *name)
{
- BaseLegacy *base = (BaseLegacy *)ale->data;
+ Base *base = (Base *)ale->data;
Object *ob = base->object;
/* just copy the name... */
@@ -683,7 +683,7 @@ static bool acf_object_name_prop(bAnimListElem *ale, PointerRNA *ptr, PropertyRN
/* check if some setting exists for this channel */
static bool acf_object_setting_valid(bAnimContext *ac, bAnimListElem *ale, eAnimChannel_Settings setting)
{
- BaseLegacy *base = (BaseLegacy *)ale->data;
+ Base *base = (Base *)ale->data;
Object *ob = base->object;
switch (setting) {
@@ -740,7 +740,7 @@ static int acf_object_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Settin
/* get pointer to the setting */
static void *acf_object_setting_ptr(bAnimListElem *ale, eAnimChannel_Settings setting, short *type)
{
- BaseLegacy *base = (BaseLegacy *)ale->data;
+ Base *base = (Base *)ale->data;
Object *ob = base->object;
/* clear extra return data first */
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 1ada2067929..12803854a42 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -892,7 +892,7 @@ void ob_to_keylist(bDopeSheet *ads, Object *ob, DLRBT_Tree *keys, DLRBT_Tree *bl
int filter;
bAnimListElem dummychan = {NULL};
- BaseLegacy dummybase = {NULL};
+ Base dummybase = {NULL};
if (ob == NULL)
return;
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 5d1366e03f8..9d25fc9e1a3 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -193,7 +193,7 @@ static short ob_keyframes_loop(KeyframeEditData *ked, bDopeSheet *ads, Object *o
int ret = 0;
bAnimListElem dummychan = {NULL};
- BaseLegacy dummybase = {NULL};
+ Base dummybase = {NULL};
if (ob == NULL)
return 0;
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h
index 89839af2ae0..192bb8eea61 100644
--- a/source/blender/editors/armature/armature_intern.h
+++ b/source/blender/editors/armature/armature_intern.h
@@ -37,7 +37,7 @@ struct wmOperatorType;
struct bContext;
struct Scene;
struct Object;
-struct BaseLegacy;
+struct Base;
struct bAction;
struct bPoseChannel;
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index 6ce86f082b0..489f238d85a 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -35,7 +35,7 @@ extern "C" {
#endif
struct bArmature;
-struct BaseLegacy;
+struct Base;
struct bContext;
struct Bone;
struct bPoseChannel;
@@ -45,7 +45,6 @@ struct ListBase;
struct MeshDeformModifierData;
struct DerivedMesh;
struct Object;
-struct Base;
struct ReportList;
struct Scene;
struct SceneLayer;
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 0dbe37c91b5..1e5ba378d7d 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -36,13 +36,12 @@ extern "C" {
#endif
struct bFaceMap;
-struct BaseLegacy;
+struct Base;
struct EnumPropertyItem;
struct ID;
struct Main;
struct ModifierData;
struct Object;
-struct Base;
struct ReportList;
struct Scene;
struct SceneLayer;
diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.h
index 8fd0c8c68a8..536f9c22dcd 100644
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@ -110,7 +110,6 @@ enum TfmMode {
bool calculateTransformCenter(struct bContext *C, int centerMode, float cent3d[3], float cent2d[2]);
struct TransInfo;
-struct BaseLegacy;
struct Scene;
struct Object;
struct wmManipulatorGroup;
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 341cdcdb40a..8116a1ba456 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -37,7 +37,7 @@ struct BMEdge;
struct BMFace;
struct BMVert;
struct BPoint;
-struct BaseLegacy;
+struct Base;
struct BezTriple;
struct BoundBox;
struct Camera;
@@ -203,7 +203,7 @@ void pose_foreachScreenBone(
void ED_view3d_project_float_v2_m4(const struct ARegion *ar, const float co[3], float r_co[2], float mat[4][4]);
void ED_view3d_project_float_v3_m4(const struct ARegion *ar, const float co[3], float r_co[3], float mat[4][4]);
-eV3DProjStatus ED_view3d_project_base(const struct ARegion *ar, struct BaseLegacy *base);
+eV3DProjStatus ED_view3d_project_base(const struct ARegion *ar, struct Base *base);
/* *** short *** */
eV3DProjStatus ED_view3d_project_short_ex(const struct ARegion *ar, float perspmat[4][4], const bool is_local,
@@ -398,7 +398,7 @@ struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
int alpha_mode, int samples, bool full_samples, const char *viewname,
struct GPUFX *fx, struct GPUOffScreen *ofs, char err_out[256]);
-struct BaseLegacy *ED_view3d_give_base_under_cursor(struct bContext *C, const int mval[2]);
+struct Base *ED_view3d_give_base_under_cursor(struct bContext *C, const int mval[2]);
void ED_view3d_quadview_update(struct ScrArea *sa, struct ARegion *ar, bool do_clip);
void ED_view3d_update_viewmat(
const struct EvaluationContext *eval_ctx, struct Scene *scene, struct View3D *v3d, struct ARegion *ar,
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 40fbb673c62..e92139ada0c 100644
--- a/source/blender/editor
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list