[Bf-blender-cvs] [3de5370e9df] blender2.8: Cleanup: unused defines

Campbell Barton noreply at git.blender.org
Sat Jul 1 03:30:14 CEST 2017


Commit: 3de5370e9dfc9d9f90b9bf2d5eeb47e9ae7bf1dd
Author: Campbell Barton
Date:   Sat Jul 1 20:19:12 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB3de5370e9dfc9d9f90b9bf2d5eeb47e9ae7bf1dd

Cleanup: unused defines

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

M	source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
M	source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
M	source/blender/makesdna/intern/makesdna.c
M	source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c

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

diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
index 485b42f9929..0b979758688 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
@@ -432,8 +432,6 @@ static void manipulator_dial_invoke(
  *
  * \{ */
 
-#define ASSERT_TYPE_CHECK(mpr) BLI_assert(mpr->type->draw == manipulator_dial_draw)
-
 static void MANIPULATOR_WT_dial_3d(wmManipulatorType *wt)
 {
 	/* identifiers */
diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
index 9e563f6133b..6943ae2c9f0 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c
@@ -78,7 +78,6 @@ typedef struct GrabInteraction {
 	} output;
 } GrabInteraction;
 
-#define DIAL_WIDTH       1.0f
 #define DIAL_RESOLUTION 32
 
 /* -------------------------------------------------------------------- */
@@ -223,8 +222,6 @@ static void manipulator_grab_invoke(
  *
  * \{ */
 
-#define ASSERT_TYPE_CHECK(mpr) BLI_assert(mpr->type->draw == manipulator_grab_draw)
-
 static void MANIPULATOR_WT_grab_3d(wmManipulatorType *wt)
 {
 	/* identifiers */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 76be857b1af..182a026df94 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -56,9 +56,6 @@
 
 #include "../blenlib/BLI_sys_types.h" // for intptr_t support
 
-/* Allow includinsg DNA files for specially guarded namespaces */
-#define DNA_NAMESPACE
-
 #define SDNA_MAX_FILENAME_LENGTH 255
 
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
index 4a022c06613..fcf7b2c986f 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
@@ -45,9 +45,6 @@
 #include "wm_manipulator_wmapi.h"
 #include "wm_manipulator_intern.h"
 
-/* factor for precision tweaking */
-#define MANIPULATOR_PRECISION_FAC 0.05f
-
 /* -------------------------------------------------------------------- */
 
 /** \name Property Definition
@@ -274,4 +271,4 @@ void WM_manipulatortype_target_property_def(
 	BLI_addtail(&wt->target_property_defs, mpt);
 }
 
-/** \} */
\ No newline at end of file
+/** \} */




More information about the Bf-blender-cvs mailing list