[Bf-blender-cvs] [7ba53e900fb] custom-manipulators: Building without Python works again

Campbell Barton noreply at git.blender.org
Mon Jun 26 05:54:11 CEST 2017


Commit: 7ba53e900fb03dd392d1178a53ed3ad152764542
Author: Campbell Barton
Date:   Mon Jun 26 13:59:55 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB7ba53e900fb03dd392d1178a53ed3ad152764542

Building without Python works again

===================================================================

M	source/blender/makesrna/intern/rna_wm_manipulator.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c b/source/blender/makesrna/intern/rna_wm_manipulator.c
index 9c7dd5f047d..030f1a1628c 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator.c
@@ -379,6 +379,8 @@ static int rna_Manipulator_name_length(PointerRNA *ptr)
 	return strlen(mpr->name);
 }
 
+#ifdef WITH_PYTHON
+
 static void rna_Manipulator_unregister(struct Main *bmain, StructRNA *type);
 void BPY_RNA_manipulator_wrapper(wmManipulatorType *wgt, void *userdata);
 
@@ -484,6 +486,9 @@ static void **rna_Manipulator_instance(PointerRNA *ptr)
 	return &mpr->py_instance;
 }
 
+#endif  /* WITH_PYTHON */
+
+
 static StructRNA *rna_Manipulator_refine(PointerRNA *mnp_ptr)
 {
 	wmManipulator *mpr = mnp_ptr->data;
@@ -783,6 +788,8 @@ static void **rna_ManipulatorGroup_instance(PointerRNA *ptr)
 	return &mgroup->py_instance;
 }
 
+#endif  /* WITH_PYTHON */
+
 static StructRNA *rna_ManipulatorGroup_refine(PointerRNA *mgroup_ptr)
 {
 	wmManipulatorGroup *mgroup = mgroup_ptr->data;
@@ -795,8 +802,6 @@ static void rna_ManipulatorGroup_manipulators_begin(CollectionPropertyIterator *
 	rna_iterator_listbase_begin(iter, &mgroup->manipulators, NULL);
 }
 
-#endif
-
 /** \} */




More information about the Bf-blender-cvs mailing list