Differential D2917 Diff 9552 source/blender/makesdna/DNA_workspace_types.h

Changeset View

Standalone View

source/blender/makesdna/DNA_workspace_types.h

Show All 23 Lines
* Use API in BKE_workspace.h!		* Use API in BKE_workspace.h!
* Struct members marked with DNA_PRIVATE_WORKSPACE will throw a		* Struct members marked with DNA_PRIVATE_WORKSPACE will throw a
* warning saying it's deprecated when used outside of workspace.c.		* warning saying it's deprecated when used outside of workspace.c.
*/		*/

#ifndef __DNA_WORKSPACE_TYPES_H__		#ifndef __DNA_WORKSPACE_TYPES_H__
#define __DNA_WORKSPACE_TYPES_H__		#define __DNA_WORKSPACE_TYPES_H__

		struct wmMsgBus;

#include "DNA_scene_types.h"		#include "DNA_scene_types.h"

/* Same logic as DNA_DEPRECATED_ALLOW, but throws 'deprecated'		/* Same logic as DNA_DEPRECATED_ALLOW, but throws 'deprecated'
* warnings if DNA_PRIVATE_WORKSPACE_ALLOW is not defined */		* warnings if DNA_PRIVATE_WORKSPACE_ALLOW is not defined */
#ifdef DNA_PRIVATE_WORKSPACE_ALLOW		#ifdef DNA_PRIVATE_WORKSPACE_ALLOW
/* allow use of private items */		/* allow use of private items */
# define DNA_PRIVATE_WORKSPACE		# define DNA_PRIVATE_WORKSPACE
#else		#else
▲ Show 20 Lines • Show All 49 Lines • ▼ Show 20 Lines	typedef struct WorkSpace {
ListBase transform_orientations DNA_PRIVATE_WORKSPACE;		ListBase transform_orientations DNA_PRIVATE_WORKSPACE;

int object_mode DNA_PRIVATE_WORKSPACE; /* enum eObjectMode */		int object_mode DNA_PRIVATE_WORKSPACE; /* enum eObjectMode */
int flags DNA_PRIVATE_WORKSPACE; /* enum eWorkSpaceFlags */		int flags DNA_PRIVATE_WORKSPACE; /* enum eWorkSpaceFlags */

/* should be: '#ifdef USE_WORKSPACE_TOOL'. */		/* should be: '#ifdef USE_WORKSPACE_TOOL'. */
bToolDef tool;		bToolDef tool;

		struct wmMsgBus *message_bus;

struct SceneLayer *render_layer DNA_PRIVATE_WORKSPACE;		struct SceneLayer *render_layer DNA_PRIVATE_WORKSPACE;
struct ViewRender view_render;		struct ViewRender view_render;
} WorkSpace;		} WorkSpace;

/* internal struct, but exported for read/write */		/* internal struct, but exported for read/write */
#if defined(DNA_PRIVATE_READ_WRITE_ALLOW) \|\| defined(DNA_PRIVATE_WORKSPACE_ALLOW)		#if defined(DNA_PRIVATE_READ_WRITE_ALLOW) \|\| defined(DNA_PRIVATE_WORKSPACE_ALLOW)

/**		/**
▲ Show 20 Lines • Show All 51 Lines • Show Last 20 Lines