[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51379] trunk/blender: code cleanup:
Campbell Barton
ideasman42 at gmail.com
Wed Oct 17 06:13:08 CEST 2012
Revision: 51379
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51379
Author: campbellbarton
Date: 2012-10-17 04:13:03 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
code cleanup:
- move object_iterators.c --> view3d_iterators. (ED_object.h had to include ED_view3d.h which isn't so nice)
- move projection functions from view3d_view.c --> view3d_project.c (view3d_view was becoming a mishmash of utility functions and operators).
- some some cmake includes as system-includes.
Modified Paths:
--------------
trunk/blender/extern/libmv/CMakeLists.txt
trunk/blender/extern/libmv/bundle.sh
trunk/blender/extern/libmv/third_party/ceres/bundle.sh
trunk/blender/intern/bsp/CMakeLists.txt
trunk/blender/intern/cycles/bvh/CMakeLists.txt
trunk/blender/intern/cycles/device/CMakeLists.txt
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
trunk/blender/intern/cycles/render/CMakeLists.txt
trunk/blender/intern/cycles/subd/CMakeLists.txt
trunk/blender/intern/cycles/util/CMakeLists.txt
trunk/blender/intern/opencolorio/CMakeLists.txt
trunk/blender/intern/opennl/CMakeLists.txt
trunk/blender/source/blender/editors/include/ED_object.h
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/object/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/gameengine/Converter/CMakeLists.txt
Added Paths:
-----------
trunk/blender/source/blender/editors/space_view3d/view3d_iterators.c
trunk/blender/source/blender/editors/space_view3d/view3d_project.c
Removed Paths:
-------------
trunk/blender/source/blender/editors/object/object_iterators.c
Modified: trunk/blender/extern/libmv/CMakeLists.txt
===================================================================
--- trunk/blender/extern/libmv/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/extern/libmv/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -28,14 +28,14 @@
set(INC
.
- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
../colamd/Include
third_party/ceres/include
)
set(INC_SYS
+ ../Eigen3
+ third_party/ssba
+ third_party/ldl/Include
${PNG_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
)
Modified: trunk/blender/extern/libmv/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/bundle.sh 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/extern/libmv/bundle.sh 2012-10-17 04:13:03 UTC (rev 51379)
@@ -124,14 +124,14 @@
set(INC
.
- ../Eigen3
- third_party/ssba
- third_party/ldl/Include
../colamd/Include
third_party/ceres/include
)
set(INC_SYS
+ ../Eigen3
+ third_party/ssba
+ third_party/ldl/Include
\${PNG_INCLUDE_DIR}
\${ZLIB_INCLUDE_DIRS}
)
Modified: trunk/blender/extern/libmv/third_party/ceres/bundle.sh
===================================================================
--- trunk/blender/extern/libmv/third_party/ceres/bundle.sh 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/extern/libmv/third_party/ceres/bundle.sh 2012-10-17 04:13:03 UTC (rev 51379)
@@ -117,13 +117,13 @@
set(INC
.
- ../../../Eigen3
include
internal
../gflags
)
set(INC_SYS
+ ../../../Eigen3
)
set(SRC
Modified: trunk/blender/intern/bsp/CMakeLists.txt
===================================================================
--- trunk/blender/intern/bsp/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/bsp/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -29,11 +29,10 @@
../guardedalloc
../memutil
../moto/include
- ../../extern/carve/include
)
set(INC_SYS
-
+ ../../extern/carve/include
)
set(SRC
Modified: trunk/blender/intern/cycles/bvh/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/bvh/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/bvh/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -7,6 +7,7 @@
../util
../device
)
+
set(INC_SYS
)
Modified: trunk/blender/intern/cycles/device/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/device/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/device/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -7,6 +7,7 @@
../util
../render
)
+
set(INC_SYS
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -5,7 +5,9 @@
osl
svm
)
+
set(INC_SYS
+
)
set(SRC
Modified: trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/kernel/osl/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -7,7 +7,9 @@
../../util
../../device
)
+
set(INC_SYS
+
)
set(SRC
Modified: trunk/blender/intern/cycles/render/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/render/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/render/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -8,6 +8,7 @@
../bvh
../util
)
+
set(INC_SYS
${GLEW_INCLUDE_PATH}
)
Modified: trunk/blender/intern/cycles/subd/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/subd/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/subd/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -6,7 +6,9 @@
../kernel/svm
../render
)
+
set(INC_SYS
+
)
set(SRC
Modified: trunk/blender/intern/cycles/util/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/util/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/cycles/util/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -2,6 +2,7 @@
set(INC
.
)
+
set(INC_SYS
${GLEW_INCLUDE_PATH}
${OPENGL_INCLUDE_DIR}
Modified: trunk/blender/intern/opencolorio/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opencolorio/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/opencolorio/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -30,6 +30,7 @@
)
set(INC_SYS
+
)
set(SRC
Modified: trunk/blender/intern/opennl/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opennl/CMakeLists.txt 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/intern/opennl/CMakeLists.txt 2012-10-17 04:13:03 UTC (rev 51379)
@@ -40,11 +40,10 @@
set(INC
extern
superlu
- ../../extern/colamd/Include
)
set(INC_SYS
-
+ ../../extern/colamd/Include
)
set(SRC
Modified: trunk/blender/source/blender/editors/include/ED_object.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_object.h 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/source/blender/editors/include/ED_object.h 2012-10-17 04:13:03 UTC (rev 51379)
@@ -197,50 +197,6 @@
/* object_select.c */
void ED_object_select_linked_by_id(struct bContext *C, struct ID *id);
-
-/* object_iterators.c */
-
-#include "ED_view3d.h" /* XXX, needed for eV3DProjTest */
-
-/* foreach iterators */
-void mesh_foreachScreenVert(
- struct ViewContext *vc,
- void (*func)(void *userData, struct BMVert *eve, const float screen_co[2], int index),
- void *userData, const eV3DProjTest clip_flag);
-void mesh_foreachScreenEdge(
- struct ViewContext *vc,
- void (*func)(void *userData, struct BMEdge *eed, const float screen_co_a[2], const float screen_co_b[2],
- int index),
- void *userData, const eV3DProjTest clip_flag);
-void mesh_foreachScreenFace(
- struct ViewContext *vc,
- void (*func)(void *userData, struct BMFace *efa, const float screen_co[2], int index),
- void *userData, const eV3DProjTest clip_flag);
-void nurbs_foreachScreenVert(
- struct ViewContext *vc,
- void (*func)(void *userData, struct Nurb *nu, struct BPoint *bp, struct BezTriple *bezt,
- int beztindex, const float screen_co[2]),
- void *userData, const eV3DProjTest clip_flag);
-void mball_foreachScreenElem(
- struct ViewContext *vc,
- void (*func)(void *userData, struct MetaElem *ml, const float screen_co[2]),
- void *userData, const eV3DProjTest clip_flag);
-void lattice_foreachScreenVert(
- struct ViewContext *vc,
- void (*func)(void *userData, struct BPoint *bp,
- const float screen_co[2]),
- void *userData, const eV3DProjTest clip_flag);
-void armature_foreachScreenBone(
- struct ViewContext *vc,
- void (*func)(void *userData, struct EditBone *ebone,
- const float screen_co_a[2], const float screen_co_b[2]),
- void *userData, const eV3DProjTest clip_flag);
-void pose_foreachScreenBone(
- struct ViewContext *vc,
- void (*func)(void *userData, struct bPoseChannel *pchan,
- const float screen_co_a[2], const float screen_co_b[2]),
- void *userData, const eV3DProjTest clip_flag);
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_view3d.h 2012-10-17 01:53:29 UTC (rev 51378)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h 2012-10-17 04:13:03 UTC (rev 51379)
@@ -37,6 +37,7 @@
struct BMFace;
struct BMVert;
struct BPoint;
+struct Base;
struct BezTriple;
struct BezTriple;
struct BoundBox;
@@ -50,11 +51,12 @@
struct Object;
struct RegionView3D;
struct Scene;
-struct bScreen;
struct ScrArea;
struct View3D;
struct ViewContext;
struct bContext;
+struct bPoseChannel;
+struct bScreen;
struct bglMats;
struct rcti;
struct wmOperator;
@@ -84,15 +86,6 @@
float *give_cursor(struct Scene *scene, struct View3D *v3d);
-int initgrabz(struct RegionView3D *rv3d, float x, float y, float z);
-
-void ED_view3d_win_to_3d(struct ARegion *ar, const float depth_pt[3], const float mval[2], float out[3]);
-void ED_view3d_win_to_delta(struct ARegion *ar, const float mval[2], float out[3]);
-void ED_view3d_win_to_vector(struct ARegion *ar, const float mval[2], float out[3]);
-void ED_view3d_win_to_segment_clip(struct ARegion *ar, struct View3D *v3d, const float mval[2], float ray_start[3], float ray_end[3]);
-void ED_view3d_win_to_ray(struct ARegion *ar, struct View3D *v3d, const float mval[2], float ray_start[3], float ray_normal[3]);
-
-void ED_view3d_global_to_vector(struct RegionView3D *rv3d, const float coord[3], float vec[3]);
void ED_view3d_to_m4(float mat[][4], const float ofs[3], const float quat[4], const float dist);
void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist);
@@ -132,6 +125,55 @@
#define V3D_PROJ_TEST_ALL (V3D_PROJ_TEST_CLIP_BB | V3D_PROJ_TEST_CLIP_WIN)
+/* view3d_iterators.c */
+
+/* foreach iterators */
+void mesh_foreachScreenVert(
+ struct ViewContext *vc,
+ void (*func)(void *userData, struct BMVert *eve, const float screen_co[2], int index),
+ void *userData, const eV3DProjTest clip_flag);
+void mesh_foreachScreenEdge(
+ struct ViewContext *vc,
+ void (*func)(void *userData, struct BMEdge *eed, const float screen_co_a[2], const float screen_co_b[2],
+ int index),
+ void *userData, const eV3DProjTest clip_flag);
+void mesh_foreachScreenFace(
+ struct ViewContext *vc,
+ void (*func)(void *userData, struct BMFace *efa, const float screen_co[2], int index),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list