Commit: 5530aa6aaac51dff1ba86d451652d7635b684fb4
Author: Campbell Barton
Date: Wed Jun 14 04:14:32 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB5530aa6aaac51dff1ba86d451652d7635b684fb4
Cleanup: remove DNA_manipulator_types.h
===================================================================
M source/blender/CMakeLists.txt
M source/blender/editors/manipulator_library/arrow2d_manipulator.c
M source/blender/editors/manipulator_library/arrow3d_manipulator.c
M source/blender/editors/manipulator_library/cage2d_manipulator.c
M source/blender/editors/manipulator_library/dial3d_manipulator.c
M source/blender/editors/manipulator_library/facemap3d_manipulator.c
M source/blender/editors/manipulator_library/manipulator_draw_utils.c
M source/blender/editors/manipulator_library/manipulator_library_presets.c
M source/blender/editors/manipulator_library/primitive3d_manipulator.c
M source/blender/editors/space_node/node_manipulators.c
M source/blender/editors/space_view3d/view3d_manipulators.c
M source/blender/editors/transform/transform_manipulator.c
M source/blender/editors/transform/transform_manipulator2d.c
D source/blender/makesdna/DNA_manipulator_types.h
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/intern/rna_wm_manipulator.c
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/manipulators/WM_manipulator_types.h
M source/blender/windowmanager/manipulators/intern/wm_manipulator.c
M source/blender/windowmanager/manipulators/intern/wm_manipulator_type.c
M source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
M
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup_type.c
M source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c
===================================================================
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index b46d3a3e64c..564ca473903 100644
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -58,7 +58,6 @@ set(SRC_DNA_INC
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
- ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_manipulator_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meshdata_types.h
diff --git a/source/blender/editors/manipulator_library/arrow2d_manipulator.c
b/source/blender/editors/manipulator_library/arrow2d_manipulator.c
index 1273710ff69..1798a3dbd6d 100644
--- a/source/blender/editors/manipulator_library/arrow2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/arrow2d_manipulator.c
@@ -39,7 +39,6 @@
#include "BLI_math.h"
#include "BLI_rect.h"
-#include "DNA_manipulator_types.h"
#include "DNA_windowmanager_types.h"
#include "ED_screen.h"
diff --git a/source/blender/editors/manipulator_library/arrow3d_manipulator.c
b/source/blender/editors/manipulator_library/arrow3d_manipulator.c
index a2a2feb811c..fc7c72ea612 100644
--- a/source/blender/editors/manipulator_library/arrow3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/arrow3d_manipulator.c
@@ -40,7 +40,6 @@
#include "BLI_math.h"
-#include "DNA_manipulator_types.h"
#include "DNA_view3d_types.h"
#include "ED_view3d.h"
diff --git a/source/blender/editors/manipulator_library/cage2d_manipulator.c
b/source/blender/editors/manipulator_library/cage2d_manipulator.c
index 6bfa81e056b..0f45db8b9ef 100644
--- a/source/blender/editors/manipulator_library/cage2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/cage2d_manipulator.c
@@ -41,8 +41,6 @@
#include "BLI_math.h"
#include "BLI_rect.h"
-#include "DNA_manipulator_types.h"
-
#include "ED_screen.h"
#include "ED_manipulator_library.h"
diff --git a/source/blender/editors/manipulator_library/dial3d_manipulator.c
b/source/blender/editors/manipulator_library/dial3d_manipulator.c
index 2d5266647e0..828ca6626ae 100644
--- a/source/blender/editors/manipulator_library/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/dial3d_manipulator.c
@@ -41,8 +41,6 @@
#include "BLI_math.h"
-#include "DNA_manipulator_types.h"
-
#include "ED_screen.h"
#include "ED_view3d.h"
#include "ED_manipulator_library.h"
diff --git a/source/blender/editors/manipulator_library/facemap3d_manipulator.c
b/source/blender/editors/manipulator_library/facemap3d_manipulator.c
index e5d03329cf0..d9a3de920df 100644
--- a/source/blender/editors/manipulator_library/facemap3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/facemap3d_manipulator.c
@@ -42,7 +42,6 @@
#include "BLI_listbase.h"
-#include "DNA_manipulator_types.h"
#include "DNA_object_types.h"
#include "ED_screen.h"
diff --git
a/source/blender/editors/manipulator_library/manipulator_draw_utils.c
b/source/blender/editors/manipulator_library/manipulator_draw_utils.c
index fc7b22ac0f0..239d7d68d09 100644
--- a/source/blender/editors/manipulator_library/manipulator_draw_utils.c
+++ b/source/blender/editors/manipulator_library/manipulator_draw_utils.c
@@ -35,8 +35,6 @@
#include "BLI_string.h"
#include "BLI_string_utils.h"
-#include "DNA_manipulator_types.h"
-
#include "ED_screen.h"
#include "ED_view3d.h"
diff --git
a/source/blender/editors/manipulator_library/manipulator_library_presets.c
b/source/blender/editors/manipulator_library/manipulator_library_presets.c
index fc7b5f88f44..d8e66f40be0 100644
--- a/source/blender/editors/manipulator_library/manipulator_library_presets.c
+++ b/source/blender/editors/manipulator_library/manipulator_library_presets.c
@@ -32,7 +32,6 @@
#include "BLI_math.h"
-#include "DNA_manipulator_types.h"
#include "DNA_view3d_types.h"
#include "DNA_object_types.h"
diff --git
a/source/blender/editors/manipulator_library/primitive3d_manipulator.c
b/source/blender/editors/manipulator_library/primitive3d_manipulator.c
index 63ed4ddf6b8..8c5d591fd32 100644
--- a/source/blender/editors/manipulator_library/primitive3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/primitive3d_manipulator.c
@@ -36,7 +36,6 @@
#include "BLI_math.h"
#include "DNA_view3d_types.h"
-#include "DNA_manipulator_types.h"
#include "GPU_immediate.h"
#include "GPU_matrix.h"
diff --git a/source/blender/editors/space_node/node_manipulators.c
b/source/blender/editors/space_node/node_manipulators.c
index 3b590c0a59e..c489fc0e23a 100644
--- a/source/blender/editors/space_node/node_manipulators.c
+++ b/source/blender/editors/space_node/node_manipulators.c
@@ -25,8 +25,6 @@
#include "BKE_context.h"
#include "BKE_image.h"
-#include "DNA_manipulator_types.h"
-
#include "ED_screen.h"
#include "ED_manipulator_library.h"
diff --git a/source/blender/editors/space_view3d/view3d_manipulators.c
b/source/blender/editors/space_view3d/view3d_manipulators.c
index 551d7f7b7ef..f92cc560f5f 100644
--- a/source/blender/editors/space_view3d/view3d_manipulators.c
+++ b/source/blender/editors/space_view3d/view3d_manipulators.c
@@ -40,7 +40,6 @@
#include "DNA_lamp_types.h"
#include "DNA_object_types.h"
#include "DNA_object_force.h"
-#include "DNA_manipulator_types.h"
#include "ED_armature.h"
#include "ED_screen.h"
diff --git a/source/blender/editors/transform/transform_manipulator.c
b/source/blender/editors/transform/transform_manipulator.c
index 9655ee236b9..bd470bd08d9 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -39,7 +39,6 @@
#include "DNA_curve_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_lattice_types.h"
-#include "DNA_manipulator_types.h"
#include "DNA_meta_types.h"
#include "DNA_screen_types.h"
#include "DNA_scene_types.h"
diff --git a/source/blender/editors/transform/transform_manipulator2d.c
b/source/blender/editors/transform/transform_manipulator2d.c
index 0db4f3cb0cb..7990834ed8c 100644
--- a/source/blender/editors/transform/transform_manipulator2d.c
+++ b/source/blender/editors/transform/transform_manipulator2d.c
@@ -42,7 +42,6 @@
#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "DNA_view3d_types.h"
-#include "DNA_manipulator_types.h"
#include "ED_image.h"
#include "ED_screen.h"
diff --git a/source/blender/makesdna/DNA_manipulator_types.h
b/source/blender/makesdna/DNA_manipulator_types.h
deleted file mode 100644
index 006a308162b..00000000000
--- a/source/blender/makesdna/DNA_manipulator_types.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file DNA_manipulator_types.h
- * \ingroup DNA
- */
-
-#ifndef __DNA_MANIPULATOR_TYPES_H__
-#define __DNA_MANIPULATOR_TYPES_H__
-
-typedef struct wmManipulatorGroup {
- struct wmManipulatorGroup *next, *prev;
-
- struct wmManipulatorGroupType *type;
- ListBase manipulators;
-
- struct wmManipulatorMap *parent_mmap;
-
- void *py_instance; /* python stores the class instance here
*/
- struct ReportList *reports; /* errors and warnings storage */
-
- void *customdata;
- void (*customdata_free)(void *); /* for freeing customdata from above */
- int flag; /* private */
- int pad;
-} wmManipulatorGroup;
-
-#endif /* __DNA_MANIPULATOR_TYPES_H__ */
diff --git a/source/blender/makesdna/intern/makesdna.c
b/source/blender/makesdna/intern/makesdna.c
index c39e63ff8a5..76be857b1af 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -80,7 +80,6 @@ static const char *includefiles[] = {
"DNA_image_types.h",
"DNA_texture_types.h",
"DNA_lamp_types.h",
- "DNA_manipulator_types.h",
"DNA_material_types.h",
"DNA_vfont_types.h",
"DNA_meta_types.h",
@@ -1308,7 +1307,6 @@ int main(int argc, char **argv)
#include "DNA_image_types.h"
#include "DNA_texture_types.h"
#include "DNA_lamp_types.h"
-#include "DNA_manipulator_types.h"
#include "DNA_material_types.h"
#include "DNA_vfont_types.h"
#include "DNA_meta_types.h"
diff --git a/source/blender/makesrna/intern/rna_wm_manipulator.c
b/source/blender/makesrna/intern/rna_wm_manipulator.c
index 283af9ecc58..297514fcbac 100644
--- a/source/blender/makesrna/intern/rna_wm_manipulator.c
+++ b/source/blender/makesrna/intern/rna_wm_manipulator.c
@@ -29,7 +29,6 @@
#include "DNA_userdef_types.h"
#include "DNA_view3d_types.h"
#include "DNA_windowmanager_types.h"
-#include "DNA_manipulator_types.h"
#include "BLI_utildefines.h"
@@ -661,6 +660,12 @@ static StructRNA *rna_ManipulatorGroup_refine(PointerRNA
*mgroup_ptr)
return (mgroup->type && mgroup->type->ext.srna) ?
mgroup->type->ext.srna : &RNA_ManipulatorGroup;
}
+static void rna_ManipulatorGroup_manipulators_begin(CollectionPropertyIterator
*iter, PointerRNA *mgroup_ptr)
+{
+ wmManipulatorGroup *mgroup = mgroup_ptr->data;
+ rna_iterator_listbase_begin(iter, &mgroup->manipulators, NULL);
+}
+
#endif
/** \} */
@@ -878,6 +883,8 @@ static void rna_def_manipulatorgroup(BlenderRNA *brna)
/* --------------------------------------------------------------------
*/
/* Registration */
+ RNA_define_verify_sdna(0); /* not in sdna */
+
prop = RNA_def_property(srna, "bl_idname", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
