[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57728] trunk/blender/source/blender/ editors: Include DNA_scene_types before ED_object instead of forward enum declaration

Sergey Sharybin sergey.vfx at gmail.com
Tue Jun 25 11:27:32 CEST 2013


Revision: 57728
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57728
Author:   nazgul
Date:     2013-06-25 09:27:31 +0000 (Tue, 25 Jun 2013)
Log Message:
-----------
Include DNA_scene_types before ED_object instead of forward enum declaration

Forward enum declaration is a bad idea, especially for C++ which requires
enum specification to dteermine which data type to use to store it.

Alternative would be to not use enum as an arument and pass it as int,
but actually would rather be strict on typing -- using explicit enum
as parameter type helps understanding the code and prevents possible
mistakes when using the function.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/curve/curve_ops.c
    trunk/blender/source/blender/editors/include/ED_object.h
    trunk/blender/source/blender/editors/mesh/editmesh_add.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c
    trunk/blender/source/blender/editors/mesh/mesh_ops.c
    trunk/blender/source/blender/editors/metaball/mball_ops.c
    trunk/blender/source/blender/editors/physics/physics_ops.c
    trunk/blender/source/blender/editors/space_api/spacetypes.c
    trunk/blender/source/blender/editors/space_logic/logic_ops.c
    trunk/blender/source/blender/editors/space_view3d/view3d_iterators.c
    trunk/blender/source/blender/editors/util/undo.c

Modified: trunk/blender/source/blender/editors/curve/curve_ops.c
===================================================================
--- trunk/blender/source/blender/editors/curve/curve_ops.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/curve/curve_ops.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -34,6 +34,7 @@
 
 
 #include "DNA_curve_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"

Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/include/ED_object.h	2013-06-25 09:27:31 UTC (rev 57728)
@@ -69,8 +69,6 @@
 struct PropertyRNA;
 struct EnumPropertyItem;
 
-enum eVGroupSelect;
-
 /* object_edit.c */
 struct Object *ED_object_context(struct bContext *C);               /* context.object */
 struct Object *ED_object_active_context(struct bContext *C); /* context.object or context.active_object */

Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -30,6 +30,7 @@
  */
 
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_math.h"
 

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -37,6 +37,7 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_listbase.h"
 #include "BLI_noise.h"

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -28,6 +28,8 @@
  *  \ingroup edmesh
  */
 
+#include "DNA_scene_types.h"
+
 #include "BLI_math.h"
 
 #include "RNA_access.h"

Modified: trunk/blender/source/blender/editors/metaball/mball_ops.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_ops.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/metaball/mball_ops.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -28,6 +28,8 @@
  *  \ingroup edmeta
  */
 
+#include "DNA_scene_types.h"
+
 #include "BLI_utildefines.h"
 
 #include "RNA_access.h"

Modified: trunk/blender/source/blender/editors/physics/physics_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_ops.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/physics/physics_ops.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -29,6 +29,8 @@
 
 #include <stdlib.h>
 
+#include "DNA_scene_types.h"
+
 #include "BLI_utildefines.h"
 
 #include "RNA_access.h"

Modified: trunk/blender/source/blender/editors/space_api/spacetypes.c
===================================================================
--- trunk/blender/source/blender/editors/space_api/spacetypes.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/space_api/spacetypes.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -33,6 +33,7 @@
 #include "BLI_utildefines.h"
 
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 #include "DNA_windowmanager_types.h"
 
 

Modified: trunk/blender/source/blender/editors/space_logic/logic_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_ops.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/space_logic/logic_ops.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -34,6 +34,7 @@
 #include "DNA_sensor_types.h"
 #include "DNA_controller_types.h"
 #include "DNA_actuator_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_utildefines.h"

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_iterators.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_iterators.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_iterators.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -30,6 +30,7 @@
 #include "DNA_mesh_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_utildefines.h"
 #include "BLI_listbase.h"

Modified: trunk/blender/source/blender/editors/util/undo.c
===================================================================
--- trunk/blender/source/blender/editors/util/undo.c	2013-06-25 09:04:42 UTC (rev 57727)
+++ trunk/blender/source/blender/editors/util/undo.c	2013-06-25 09:27:31 UTC (rev 57728)
@@ -39,6 +39,7 @@
 
 #include "DNA_mesh_types.h"
 #include "DNA_object_types.h"
+#include "DNA_scene_types.h"
 
 #include "BLI_blenlib.h"
 #include "BLI_dynstr.h"




More information about the Bf-blender-cvs mailing list