[Bf-blender-cvs] [bccea8d399] render-layers: Base refactor 4/4
Dalai Felinto
noreply at git.blender.org
Mon Feb 6 18:07:00 CET 2017
Commit: bccea8d3991f05906b2673f224e90362a1d16d2f
Author: Dalai Felinto
Date: Mon Feb 6 17:40:11 2017 +0100
Branches: render-layers
https://developer.blender.org/rBbccea8d3991f05906b2673f224e90362a1d16d2f
Base refactor 4/4
Rebase ObjectBase > Base
===================================================================
M source/blender/blenkernel/BKE_collection.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_group.h
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/armature/armature_relations.c
M source/blender/editors/armature/editarmature_retarget.c
M source/blender/editors/armature/pose_edit.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/mesh_navmesh.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_bake.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_group.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_select.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_select.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_scene.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 47f70012bd..c3f461dacd 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -38,7 +38,7 @@ extern "C" {
struct Iterator;
struct SceneCollection;
struct Object;
-struct ObjectBase;
+struct Base;
struct Main;
struct Scene;
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 2fd11746fb..23f9ff28f8 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -44,7 +44,7 @@ struct LayerCollection;
struct ListBase;
struct Main;
struct Object;
-struct ObjectBase;
+struct Base;
struct PointerRNA;
struct ReportList;
struct Scene;
@@ -271,7 +271,7 @@ int CTX_data_selectable_objects(const bContext *C, ListBase *list);
int CTX_data_selectable_bases(const bContext *C, ListBase *list);
struct Object *CTX_data_active_object(const bContext *C);
-struct ObjectBase *CTX_data_active_base(const bContext *C);
+struct Base *CTX_data_active_base(const bContext *C);
struct Object *CTX_data_edit_object(const bContext *C);
struct Image *CTX_data_edit_image(const bContext *C);
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index 23a49b3016..f718e9c855 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -34,7 +34,7 @@
*/
struct BaseLegacy;
-struct ObjectBase;
+struct Base;
struct EvaluationContext;
struct Group;
struct Main;
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 30c9e21727..de8a577d27 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -37,7 +37,7 @@ extern "C" {
#define TODO_LAYER_SYNC_FILTER /* syncing of filter_objects across all trees */
#define TODO_LAYER_OVERRIDE /* CollectionOverride */
#define TODO_LAYER_CONTEXT /* get/set current (context) SceneLayer */
-#define TODO_LAYER_BASE /* Base to ObjectBase related TODO */
+#define TODO_LAYER_BASE /* BaseLegacy to Base related TODO */
#define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */
#define TODO_LAYER_DEPSGRAPH /* placeholder for real Depsgraph fix */
#define TODO_LAYER /* generic todo */
@@ -48,7 +48,7 @@ struct ID;
struct ListBase;
struct Main;
struct Object;
-struct ObjectBase;
+struct Base;
struct RenderEngine;
struct Scene;
struct SceneCollection;
@@ -65,9 +65,9 @@ void BKE_scene_layer_engine_set(struct SceneLayer *sl, const char *engine);
void BKE_scene_layer_selected_objects_tag(struct SceneLayer *sl, const int tag);
struct SceneLayer *BKE_scene_layer_find_from_collection(struct Scene *scene, struct LayerCollection *lc);
-struct ObjectBase *BKE_scene_layer_base_find(struct SceneLayer *sl, struct Object *ob);
+struct Base *BKE_scene_layer_base_find(struct SceneLayer *sl, struct Object *ob);
void BKE_scene_layer_base_deselect_all(struct SceneLayer *sl);
-void BKE_scene_layer_base_select(struct SceneLayer *sl, struct ObjectBase *selbase);
+void BKE_scene_layer_base_select(struct SceneLayer *sl, struct Base *selbase);
void BKE_scene_layer_base_flag_recalculate(struct SceneLayer *sl);
void BKE_scene_layer_engine_settings_recalculate(struct SceneLayer *sl);
@@ -161,7 +161,7 @@ void BKE_visible_bases_Iterator_end(Iterator *iter);
#define FOREACH_OBJECT(sl, _ob) \
{ \
- ObjectBase *base; \
+ Base *base; \
for (base = sl->object_bases.first; base; base = base->next) { \
_ob = base->object;
@@ -201,7 +201,7 @@ void BKE_visible_bases_Iterator_end(Iterator *iter);
BKE_scene_layer_engine_settings_update(sl); \
\
/* flush all the data to objects*/ \
- ObjectBase *base_; \
+ Base *base_; \
for (base_ = sl->object_bases.first; base_; base_ = base_->next) { \
ob_ = base_->object; \
ob_->base_flag = base_->flag;
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index d4b11507d1..53bb69aedb 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -42,7 +42,7 @@ struct BaseLegacy;
struct EvaluationContext;
struct Main;
struct Object;
-struct ObjectBase;
+struct Base;
struct QuicktimeCodecData;
struct RenderData;
struct SceneRenderLayer;
@@ -99,8 +99,8 @@ void BKE_scene_base_flag_to_objects(struct Scene *scene);
void BKE_scene_base_flag_from_objects(struct Scene *scene);
void BKE_scene_base_flag_sync_from_base(struct BaseLegacy *base);
void BKE_scene_base_flag_sync_from_object(struct BaseLegacy *base);
-void BKE_scene_object_base_flag_sync_from_base(struct ObjectBase *base);
-void BKE_scene_object_base_flag_sync_from_object(struct ObjectBase *base);
+void BKE_scene_object_base_flag_sync_from_base(struct Base *base);
+void BKE_scene_object_base_flag_sync_from_object(struct Base *base);
void BKE_scene_set_background(struct Main *bmain, struct Scene *sce);
struct Scene *BKE_scene_set_name(struct Main *bmain, const char *name);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index afc4a397d0..1cbf8cf01c 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1100,7 +1100,7 @@ struct Object *CTX_data_active_object(const bContext *C)
return ctx_data_pointer_get(C, "active_object");
}
-struct ObjectBase *CTX_data_active_base(const bContext *C)
+struct Base *CTX_data_active_base(const bContext *C)
{
return ctx_data_pointer_get(C, "active_base");
}
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 8d0314bd89..28c5e9aff5 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -138,7 +138,7 @@ void BKE_scene_layer_engine_set(SceneLayer *sl, const char *engine)
*/
void BKE_scene_layer_selected_objects_tag(SceneLayer *sl, const int tag)
{
- for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+ for (Base *base = sl->object_bases.first; base; base = base->next) {
if ((base->flag & BASE_SELECTED) != 0) {
base->object->flag |= tag;
}
@@ -174,23 +174,23 @@ SceneLayer *BKE_scene_layer_find_from_collection(Scene *scene, LayerCollection *
return NULL;
}
-/* ObjectBase */
+/* Base */
-ObjectBase *BKE_scene_layer_base_find(SceneLayer *sl, Object *ob)
+Base *BKE_scene_layer_base_find(SceneLayer *sl, Object *ob)
{
- return BLI_findptr(&sl->object_bases, ob, offsetof(ObjectBase, object));
+ return BLI_findptr(&sl->object_bases, ob, offsetof(Base, object));
}
void BKE_scene_layer_base_deselect_all(SceneLayer *sl)
{
- ObjectBase *base;
+ Base *base;
for (base = sl->object_bases.first; base; base = base->next) {
base->flag &= ~BASE_SELECTED;
}
}
-void BKE_scene_layer_base_select(struct SceneLayer *sl, ObjectBase *selbase)
+void BKE_scene_layer_base_select(struct SceneLayer *sl, Base *selbase)
{
sl->basact = selbase;
if ((selbase->flag & BASE_SELECTABLED) != 0) {
@@ -198,7 +198,7 @@ void BKE_scene_layer_base_select(struct SceneLayer *sl, ObjectBase *selbase)
}
}
-static void scene_layer_object_base_unref(SceneLayer* sl, ObjectBase *base)
+static void scene_layer_object_base_unref(SceneLayer* sl, Base *base)
{
base->refcount--;
@@ -220,7 +220,7 @@ static void layer_collection_base_flag_recalculate(LayerCollection *lc, const bo
bool is_selectable = tree_is_selectable && is_visible && ((lc->flag & COLLECTION_SELECTABLE) != 0);
for (LinkData *link = lc->object_bases.first; link; link = link->next) {
- ObjectBase *base = link->data;
+ Base *base = link->data;
if (is_visible) {
base->flag |= BASE_VISIBLED;
@@ -252,7 +252,7 @@ void BKE_scene_layer_base_flag_recalculate(SceneLayer *sl)
}
/* if base is not selectabled, clear select */
- for (ObjectBase *base = sl->object_bases.first; base; base = base->next) {
+ for (Base *base = sl->object_bases.first; base; base = base->next) {
if ((base->flag & BASE_SELECTABLED) == 0) {
base->flag &= ~BASE_SELECTED;
}
@@ -292,13 +292,13 @@ void BKE_scene_layer_engine_settings_update(struct SceneLayer *sl)
* Return the base if existent, or create it if necessary
* Always bump the refcount
*/
-static ObjectBase *object_base_add(SceneLayer *sl, Object *ob)
+static Base *object_base_add(SceneLayer *sl, Object *ob)
{
- ObjectBase *base;
+ Base *base;
base = BKE_scene_layer_base_find(sl, ob);
if (base == NULL) {
- base = MEM_callocN(sizeof(ObjectBase), "Object Base");
+ base = MEM_callocN(sizeof(Base), "Object Base");
/* do not bump user count, leave it for SceneCollections */
base->object = ob;
@@ -450,7 +450,7 @@ void BKE_collection_unlink(SceneLayer *sl, LayerCollection *lc)
static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Object *ob)
{
- ObjectBase *base = object_base_add(sl, ob);
+ Base *base = object_base_add(sl, ob);
/* only add an object once - prevent SceneCollection->objects and
* SceneCollection->filter_objects to add the same object */
@@ -466,7 +466,7 @@ static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Obj
static void layer_collection_object_remove(SceneLayer *sl, LayerCollection *lc, Object *ob)
{
- ObjectBase *base;
+ Base *base;
base = BKE_scene_layer_base_find(sl, ob);
LinkData *link = BLI_findptr(&lc->object_bases, base, offsetof(LinkData, data));
@@ -528,7 +528,7 @@ bool BKE_scene_layer_has_collection(struct SceneLayer *sl, struct SceneCollectio
bool BKE_scene_has_object(Scene *scene, Object *ob)
{
for (SceneLayer *sl =
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list