Page MenuHome
Differential D8159 Diff 26431 source/blender/windowmanager/WM_types.h

Changeset View

Standalone View

View Options

source/blender/windowmanager/WM_types.h

Show First 20 Lines • Show All 355 Lines • ▼ Show 20 Lines
#define ND_KEYS (25 << 16) #define ND_KEYS (25 << 16)
#define ND_CONSTRAINT (26 << 16) #define ND_CONSTRAINT (26 << 16)
#define ND_PARTICLE (27 << 16) #define ND_PARTICLE (27 << 16)
#define ND_POINTCACHE (28 << 16) #define ND_POINTCACHE (28 << 16)
#define ND_PARENT (29 << 16) #define ND_PARENT (29 << 16)
#define ND_LOD (30 << 16) #define ND_LOD (30 << 16)
#define ND_DRAW_RENDER_VIEWPORT \ #define ND_DRAW_RENDER_VIEWPORT \
(31 << 16) /* for camera & sequencer viewport update, also /w NC_SCENE */ (31 << 16) /* for camera & sequencer viewport update, also /w NC_SCENE */
#define ND_SHADERFX (32 << 16)
antoniovUnsubmitted
Done
Inline Actions

Compiling in Windows get an error because this is already used.

case ND_SHADING:
       case ND_SHADING_DRAW:
       case ND_SHADING_LINKS:  <<<<<<<<<<<<<<<< This one
       case ND_SHADING_PREVIEW:
         /* currently works by redraws... if preview is set, it (re)starts job */
         sbuts->preview = 1;
         break;

Error: C2196 case value '2097152' already used

antoniov: Compiling in Windows get an error because this is already used. ``` case ND_SHADING…
/* NC_MATERIAL Material */ /* NC_MATERIAL Material */
#define ND_SHADING (30 << 16) #define ND_SHADING (33 << 16)
#define ND_SHADING_DRAW (31 << 16) #define ND_SHADING_DRAW (34 << 16)
#define ND_SHADING_LINKS (32 << 16) #define ND_SHADING_LINKS (35 << 16)
#define ND_SHADING_PREVIEW (33 << 16) #define ND_SHADING_PREVIEW (36 << 16)
SeverinUnsubmitted
Done
Inline Actions

Grepping the code, turns out there are no usages of NC_OBJECT | ND_SHADING(_FOO).

So you can actually just keep these at their old values and remove the cases in buttons_area_listener() for NC_OBJECT.

Severin: Grepping the code, turns out there are no usages of `NC_OBJECT | ND_SHADING(_FOO)`. So you can…
/* NC_LAMP Light */ /* NC_LAMP Light */
#define ND_LIGHTING (40 << 16) #define ND_LIGHTING (40 << 16)
#define ND_LIGHTING_DRAW (41 << 16) #define ND_LIGHTING_DRAW (41 << 16)
/* NC_WORLD World */ /* NC_WORLD World */
#define ND_WORLD_DRAW (45 << 16) #define ND_WORLD_DRAW (45 << 16)
▲ Show 20 Lines • Show All 554 Lines • Show Last 20 Lines