Commit: c59444f71bc428a8400165c6181bedce94861a20
Author: Julian Eisel
Date: Thu Jul 28 03:58:17 2016 +0200
Branches: temp_localview_split
https://developer.blender.org/rBc59444f71bc428a8400165c6181bedce94861a20
Move LocalView structs to DNA_screen_types.h
===================================================================
M source/blender/makesdna/DNA_object_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_view3d_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_object_types.h
b/source/blender/makesdna/DNA_object_types.h
index a1a8215..a0255f7 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -37,7 +37,7 @@
#include "DNA_listBase.h"
#include "DNA_ID.h"
#include "DNA_action_types.h" /* bAnimVizSettings */
-#include "DNA_view3d_types.h" /* LocalViewInfo */
+#include "DNA_screen_types.h" /* LocalViewInfo */
#ifdef __cplusplus
extern "C" {
diff --git a/source/blender/makesdna/DNA_screen_types.h
b/source/blender/makesdna/DNA_screen_types.h
index fbeabb3..0730791 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -199,6 +199,44 @@ typedef struct uiPreview { /* some preview UI
data need to be saved in
short pad1[3];
} uiPreview;
+/* ********************************* */
+/* Local View */
+
+/**
+ * Info about the current local view state. A local view area (View3D) and
objects have this.
+ * By comparing them we see which objects are visible. (Use with
BKE_LOCALVIEW_ macros!)
+ */
+typedef struct LocalViewInfo {
+ unsigned int viewbits; /* 32 bits to store up to 32 views */
+} LocalViewInfo;
+
+/**
+ * Data for 3D view area (View3D) while in local view.
+ */
+typedef struct LocalViewAreaData {
+ LocalViewInfo info;
+
+ /* Initial View3D values for reset after local view exit */
+ float near, far;
+ short drawtype, pad;
+ struct Object *camera;
+} LocalViewAreaData;
+
+/**
+ * Data for 3D view region (RegionView3D) while in local view.
+ */
+typedef struct LocalViewRegionData {
+ /* Initial RegionView3D values for reset after local view exit */
+ float camzoom;
+ char persp;
+ char view, pad[2];
+ float viewquat[4];
+ float dist;
+ float ofs[3];
+} LocalViewRegionData;
+
+/* ********************************* */
+
typedef struct ScrArea {
struct ScrArea *next, *prev;
diff --git a/source/blender/makesdna/DNA_view3d_types.h
b/source/blender/makesdna/DNA_view3d_types.h
index 428cb62..951aa5b 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -82,42 +82,6 @@ typedef struct BGpic {
} BGpic;
/* ********************************* */
-/* Local View Data */
-
-/**
- * Info about the current local view state. A local view area (View3D) and
objects have this.
- * By comparing them we see which objects are visible. (Use with
BKE_LOCALVIEW_ macros!)
- */
-typedef struct LocalViewInfo {
- unsigned int viewbits; /* 32 bits to store up to 32 views */
-} LocalViewInfo;
-
-/**
- * Data for 3D view area (View3D) while in local view.
- */
-typedef struct LocalViewAreaData {
- LocalViewInfo info;
-
- /* Initial View3D values for reset after local view exit */
- float near, far;
- short drawtype, pad;
- struct Object *camera;
-} LocalViewAreaData;
-
-/**
- * Data for 3D view region (RegionView3D) while in local view.
- */
-typedef struct LocalViewRegionData {
- /* Initial RegionView3D values for reset after local view exit */
- float camzoom;
- char persp;
- char view, pad[2];
- float viewquat[4];
- float dist;
- float ofs[3];
-} LocalViewRegionData;
-
-/* ********************************* */
typedef struct RegionView3D {
@@ -138,7 +102,7 @@ typedef struct RegionView3D {
struct BoundBox *clipbb;
struct RegionView3D *localvd DNA_DEPRECATED;
- LocalViewRegionData *localviewd;
+ struct LocalViewRegionData *localviewd;
struct RenderEngine *render_engine;
struct ViewDepths *depths;
void *gpuoffscreen;
@@ -214,7 +178,7 @@ typedef struct View3D {
struct BGpic *bgpic DNA_DEPRECATED; /* deprecated, use bgpicbase, only
kept for do_versions(...) */
struct View3D *localvd; /* allocated backup of its self while in
localview */
- LocalViewAreaData *localviewd;
+ struct LocalViewAreaData *localviewd;
char ob_centre_bone[64]; /* optional string for armature
bone to define center, MAXBONENAME */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
