Commit: d0d59ed282b3c1d5fe07c18418fa82cfb527e37c
Author: Bastien Montagne
Date: Fri Dec 18 22:12:32 2015 +0100
Branches: master
https://developer.blender.org/rBd0d59ed282b3c1d5fe07c18418fa82cfb527e37c
Add a void 'user_data' memeber to Outliner's callbacks.
This is not used currently, but needed for work done in id-remap branch, and
will
greatly reduce diff noise in this area...
===================================================================
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_tools.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_edit.c
b/source/blender/editors/space_outliner/outliner_edit.c
index 46974a6..8f322af 100644
--- a/source/blender/editors/space_outliner/outliner_edit.c
+++ b/source/blender/editors/space_outliner/outliner_edit.c
@@ -230,7 +230,7 @@ static void do_item_rename(ARegion *ar, TreeElement *te,
TreeStoreElem *tselem,
}
void item_rename_cb(bContext *C, Scene *UNUSED(scene), TreeElement *te,
- TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void
*UNUSED(user_data))
{
ARegion *ar = CTX_wm_region(C);
ReportList *reports = CTX_wm_reports(C); // XXX
@@ -322,7 +322,8 @@ static void lib_delete(bContext *C, TreeElement *te,
TreeStoreElem *tselem, Repo
}
void lib_delete_cb(
- bContext *C, Scene *UNUSED(scene), TreeElement *te, TreeStoreElem
*UNUSED(tsep), TreeStoreElem *tselem)
+ bContext *C, Scene *UNUSED(scene), TreeElement *te,
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem *tselem, void
*UNUSED(user_data))
{
lib_delete(C, te, tselem, CTX_wm_reports(C));
}
@@ -467,7 +468,7 @@ int common_restrict_check(bContext *C, Object *ob)
/* Toggle Visibility ---------------------------------------- */
void object_toggle_visibility_cb(bContext *C, Scene *scene, TreeElement *te,
- TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem, void *UNUSED(user_data))
{
Base *base = (Base *)te->directdata;
Object *ob = (Object *)tselem->id;
@@ -483,7 +484,7 @@ void object_toggle_visibility_cb(bContext *C, Scene *scene,
TreeElement *te,
}
void group_toggle_visibility_cb(bContext *UNUSED(C), Scene *scene, TreeElement
*UNUSED(te),
- TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem, void *UNUSED(user_data))
{
Group *group = (Group *)tselem->id;
restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_VIEW);
@@ -522,7 +523,7 @@ void OUTLINER_OT_visibility_toggle(wmOperatorType *ot)
/* Toggle Selectability ---------------------------------------- */
void object_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *te,
- TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem, void *UNUSED(user_data))
{
Base *base = (Base *)te->directdata;
@@ -533,7 +534,7 @@ void object_toggle_selectability_cb(bContext *UNUSED(C),
Scene *scene, TreeEleme
}
void group_toggle_selectability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *UNUSED(te),
- TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem, void *UNUSED(user_data))
{
Group *group = (Group *)tselem->id;
restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_SELECT);
@@ -570,7 +571,7 @@ void OUTLINER_OT_selectability_toggle(wmOperatorType *ot)
/* Toggle Renderability ---------------------------------------- */
void object_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *te,
- TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem, void *UNUSED(user_data))
{
Base *base = (Base *)te->directdata;
@@ -581,7 +582,7 @@ void object_toggle_renderability_cb(bContext *UNUSED(C),
Scene *scene, TreeEleme
}
void group_toggle_renderability_cb(bContext *UNUSED(C), Scene *scene,
TreeElement *UNUSED(te),
- TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem)
+ TreeStoreElem *UNUSED(tsep), TreeStoreElem
*tselem, void *UNUSED(user_data))
{
Group *group = (Group *)tselem->id;
restrictbutton_gr_restrict_flag(scene, group, OB_RESTRICT_RENDER);
diff --git a/source/blender/editors/space_outliner/outliner_intern.h
b/source/blender/editors/space_outliner/outliner_intern.h
index 262aa9b..94dc297 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -153,32 +153,32 @@ int outliner_item_do_activate(struct bContext *C, int x,
int y, bool extend, boo
void outliner_do_object_operation_ex(
struct bContext *C, struct Scene *scene, struct SpaceOops *soops,
struct ListBase *lb,
void (*operation_cb)(struct bContext *C, struct Scene *scene,
- struct TreeElement *, struct TreeStoreElem *,
TreeStoreElem *),
+ struct TreeElement *, struct TreeStoreElem *,
TreeStoreElem *, void *),
bool recurse_selected);
void outliner_do_object_operation(
struct bContext *C, struct Scene *scene, struct SpaceOops *soops,
struct ListBase *lb,
void (*operation_cb)(struct bContext *C, struct Scene *scene,
- struct TreeElement *, struct TreeStoreElem *,
TreeStoreElem *));
+ struct TreeElement *, struct TreeStoreElem *,
TreeStoreElem *, void *));
int common_restrict_check(struct bContext *C, struct Object *ob);
int outliner_has_one_flag(struct SpaceOops *soops, ListBase *lb, short flag,
const int curlevel);
void outliner_set_flag(struct SpaceOops *soops, ListBase *lb, short flag,
short set);
-void object_toggle_visibility_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
-void object_toggle_selectability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
-void object_toggle_renderability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+void object_toggle_visibility_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
+void object_toggle_selectability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
+void object_toggle_renderability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
-void group_toggle_visibility_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
-void group_toggle_selectability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
-void group_toggle_renderability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+void group_toggle_visibility_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
+void group_toggle_selectability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
+void group_toggle_renderability_cb(struct bContext *C, struct Scene *scene,
TreeElement *te, struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
-void item_rename_cb(struct bContext *C, struct Scene *scene, TreeElement *te,
struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+void item_rename_cb(struct bContext *C, struct Scene *scene, TreeElement *te,
struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void *user_data);
void lib_delete_cb(
struct bContext *C, struct Scene *scene, struct TreeElement *te,
- struct TreeStoreElem *tsep, struct TreeStoreElem *tselem);
+ struct TreeStoreElem *tsep, struct TreeStoreElem *tselem, void
*user_data);
TreeElement *outliner_dropzone_find(const struct SpaceOops *soops, const float
fmval[2], const bool children);
/* ...................................................... */
diff --git a/source/blender/editors/space_outliner/outliner_tools.c
b/source/blender/editors/space_outliner/outliner_tools.c
index e4471ac..e2f5747 100644
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@ -134,14 +134,14 @@ static void set_operation_types(SpaceOops *soops,
ListBase *lb,
}
static void unlink_action_cb(bContext *C, Scene *UNUSED(scene), TreeElement
*UNUSED(te),
- TreeStoreElem *tsep, TreeStoreElem
*UNUSED(tselem))
+ TreeStoreElem *tsep, TreeStoreElem
*UNUSED(tselem), void *UNUSED(user_data))
{
/* just set action to NULL */
BKE_animdata_set_action(CTX_wm_reports(C), tsep->id, NULL);
}
static void unlink_material_cb(bContext *UNUSED(C), Scene *UNUSED(scene),
TreeElement *te,
- TreeStoreElem *tsep, TreeStoreElem
*UNUSED(tselem))
+ TreeStoreElem *tsep, TreeStoreElem
*UNUSED(tselem), void *UNUSED(user_data))
{
Material **matar = NULL;
int a, totcol = 0;
@@ -181,7 +181,7 @@ static void unlink_material_cb(bContext *UNUSED(C), Scene
*UNUSED(scene), TreeEl
}
static void unlink_texture_cb(bContext *UNUSED(C), Scene *UNUSED(scene),
TreeElement *te,
- TreeStoreElem *tsep, TreeStoreElem
*UNUSED(tselem))
+ TreeStoreElem *tsep, TreeStoreElem
*UNUSED(tselem), void *UNUSED(user_data))
{
MTex **mtex = NULL;
int a;
@@ -218,7 +218,7 @@ static void unlink_texture_cb(bContext *UNUSED(C), Scene
*UNUSED(scene), TreeEle
static void unlink_group_cb(
bContext *C, Scene *UNUSED(scene), TreeElement *UNUSED(te),
- TreeStoreElem *tsep, TreeStoreElem *tselem)
+ TreeStoreElem *tsep, TreeStoreElem *tselem, void *UNUSED(user_data))
{
Group *group = (Group *)tselem->id;
@@ -235,7 +235,7 @@ static void unlink_group_cb(
}
static void unlink_world_cb(b
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
