Manipulator: add optional properties argument

Needed for RNA/Py API

2 files changed, 9 insertions, 2 deletions

diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index d6e468089f8..ecb0af818b2 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -38,6 +38,7 @@
 
 struct ARegion;
 struct GHashIterator;
+struct IDProperty;
 struct Main;
 struct PropertyRNA;
 struct wmKeyConfig;
@@ -66,7 +67,8 @@ void WM_manipulator_free(
         ListBase *manipulatorlist, struct wmManipulatorMap *mmap, struct wmManipulator *mpr,
         struct bContext *C);
 
-struct PointerRNA *WM_manipulator_set_operator(struct wmManipulator *, struct wmOperatorType *ot);
+struct PointerRNA *WM_manipulator_set_operator(
+        struct wmManipulator *, struct wmOperatorType *ot, struct IDProperty *properties);
 
 /* callbacks */
 void WM_manipulator_set_fn_custom_modal(struct wmManipulator *mpr, wmManipulatorFnModal fn);
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index ba0e720485a..d11defc4e98 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -232,7 +232,8 @@ void WM_manipulator_free(ListBase *manipulatorlist, wmManipulatorMap *mmap, wmMa
  * \{ */
 
 
-PointerRNA *WM_manipulator_set_operator(wmManipulator *mpr, wmOperatorType *ot)
+PointerRNA *WM_manipulator_set_operator(
+        wmManipulator *mpr, wmOperatorType *ot, IDProperty *properties)
 {
 	mpr->op_data.type = ot;
 
@@ -241,6 +242,10 @@ PointerRNA *WM_manipulator_set_operator(wmManipulator *mpr, wmOperatorType *ot)
 	}
 	WM_operator_properties_create_ptr(&mpr->op_data.ptr, ot);
 
+	if (properties) {
+		mpr->op_data.ptr.data = properties;
+	}
+
 	return &mpr->op_data.ptr;
 }