Commit: 9149e8942107343fb31639406124428e6ff1a029
Author: Campbell Barton
Date: Mon Dec 17 10:25:40 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB9149e8942107343fb31639406124428e6ff1a029
Merge branch 'master' into blende2.8
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_camera_types.h
index 7bf89887d8c,0dedd8c84ef..17cf945fdbf
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@@ -150,12 -124,8 +150,9 @@@ enum
#endif
CAM_SHOWSENSOR = (1 << 8),
CAM_SHOW_SAFE_CENTER = (1 << 9),
+ CAM_SHOW_BG_IMAGE = (1 << 10),
};
- /* yafray: dof sampling switch */
- /* #define CAM_YF_NO_QMC 512 */ /* deprecated */
-
/* Sensor fit */
enum {
CAMERA_SENSOR_FIT_AUTO = 0,
diff --cc source/blender/makesdna/DNA_image_types.h
index a7ec121efda,cc4df10a2a2..22329661da2
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@@ -178,19 -184,20 +178,19 @@@ enum
};
/* Image.tpageflag */
- //#define IMA_TILES 1 /* Deprecated */
- //#define IMA_TWINANIM 2 /* Deprecated */
- #define IMA_COLCYCLE 4 /* Deprecated */
- #define IMA_MIPMAP_COMPLETE 8 /* all mipmap levels in OpenGL texture set? */
- //#define IMA_CLAMP_U 16 /* Deprecated */
- //#define IMA_CLAMP_V 32 /* Deprecated */
- #define IMA_TPAGE_REFRESH 64
- #define IMA_GLBIND_IS_DATA 128 /* opengl image texture bound as non-color
data */
-#define IMA_TILES (1 << 0)
-#define IMA_TWINANIM (1 << 1)
-#define IMA_COLCYCLE (1 << 2) /* Depreciated */
++//#define IMA_TILES (1 << 0) /* Deprecated */
++//#define IMA_TWINANIM (1 << 1) /* Deprecated */
++#define IMA_COLCYCLE (1 << 2) /* Deprecated */
+ #define IMA_MIPMAP_COMPLETE (1 << 3) /* all mipmap levels in OpenGL texture
set? */
-#define IMA_CLAMP_U (1 << 4)
-#define IMA_CLAMP_V (1 << 5)
-#define IMA_TPAGE_REFRESH (1 << 6)
-#define IMA_GLBIND_IS_DATA (1 << 7) /* opengl image texture bound as
non-color data */
++//#define IMA_CLAMP_U (1 << 4) /* Deprecated */
++//#define IMA_CLAMP_V (1 << 5) /* Deprecated */
++#define IMA_TPAGE_REFRESH (1 << 6)
++#define IMA_GLBIND_IS_DATA (1 << 7) /* opengl image texture bound as
non-color data */
/* ima->type and ima->source moved to BKE_image.h, for API */
/* render */
- #define IMA_MAX_RENDER_TEXT 512
-#define IMA_MAX_RENDER_TEXT (1 << 9)
-#define IMA_MAX_RENDER_SLOT (1 << 3)
++#define IMA_MAX_RENDER_TEXT (1 << 9)
/* gen_flag */
#define IMA_GEN_FLOAT 1
diff --cc source/blender/makesdna/DNA_material_types.h
index 85dfe300429,f024a3a3e9c..2de63f5d59f
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@@ -177,18 -241,118 +177,18 @@@ typedef struct Material
* -1 because for active material we store the index + 1 */
#define MAXMAT (32767-1)
-/* material_type */
-#define MA_TYPE_SURFACE 0
-#define MA_TYPE_HALO 1
-#define MA_TYPE_VOLUME 2
-#define MA_TYPE_WIRE 3
-
/* flag */
/* for render */
- #define MA_IS_USED 1
+ #define MA_IS_USED (1 << 0)
/* for dopesheet */
- #define MA_DS_EXPAND 2
+ #define MA_DS_EXPAND (1 << 1)
/* for dopesheet (texture stack expander)
* NOTE: this must have the same value as other texture stacks,
* otherwise anim-editors will not read correctly
*/
- #define MA_DS_SHOW_TEXS 4
+ #define MA_DS_SHOW_TEXS (1 << 2)
-/* mode (is int) */
-#define MA_TRACEBLE (1 << 0)
-#define MA_SHADOW (1 << 1)
-#define MA_SHLESS (1 << 2)
-#define MA_WIRE (1 << 3) /* deprecated */
-#define MA_VERTEXCOL (1 << 4)
-#define MA_HALO_SOFT (1 << 4)
-#define MA_HALO (1 << 5) /* deprecated */
-#define MA_ZTRANSP (1 << 6)
-#define MA_VERTEXCOLP (1 << 7)
-#define MA_ZINV (1 << 8)
-#define MA_HALO_RINGS (1 << 8)
-#define MA_ENV (1 << 9)
-#define MA_HALO_LINES (1 << 9)
-#define MA_ONLYSHADOW (1 << 10)
-#define MA_HALO_XALPHA (1 << 10)
-#define MA_STAR (1 << 11)
-#define MA_FACETEXTURE (1 << 11)
-#define MA_HALOTEX (1 << 12)
-#define MA_HALOPUNO (1 << 13)
-#define MA_ONLYCAST (1 << 13)
-#define MA_NOMIST (1 << 14)
-#define MA_HALO_SHADE (1 << 14)
-#define MA_HALO_FLARE (1 << 15)
-#define MA_TRANSP (1 << 16)
-#define MA_RAYTRANSP (1 << 17)
-#define MA_RAYMIRROR (1 << 18)
-#define MA_SHADOW_TRA (1 << 19)
-#define MA_RAMP_COL (1 << 20)
-#define MA_RAMP_SPEC (1 << 21)
-#define MA_RAYBIAS (1 << 22)
-#define MA_FULL_OSA (1 << 23)
-#define MA_TANGENT_STR (1 << 24)
-#define MA_SHADBUF (1 << 25)
- /* note; we drop MA_TANGENT_STR later to become tangent_u */
-#define MA_TANGENT_V (1 << 26)
-/* qdn: a bit clumsy this, tangents needed for normal maps separated from
shading */
-#define MA_NORMAP_TANG (1 << 27)
-#define MA_GROUP_NOLAY (1 << 28)
-#define MA_FACETEXTURE_ALPHA (1 << 29)
-#define MA_STR_B_UNITS (1 << 30)
-#define MA_STR_SURFDIFF (1 << 31u)
-
-#define MA_MODE_MASK (((1 << 31u) - 1) & ~(1 << 28u)) /* all valid mode
bits */
-#define MA_MODE_PIPELINE (MA_TRANSP | MA_ZTRANSP | MA_RAYTRANSP \
- | MA_TRACEBLE | MA_FULL_OSA | MA_ENV | MA_ZINV
\
- | MA_ONLYCAST | MA_SHADBUF)
-
-/* mode2 (is int) */
-#define MA_CASTSHADOW (1 << 0)
-#define MA_MODE2_PIPELINE (MA_CASTSHADOW)
-#define MA_TANGENT_CONCRETE (1 << 1)
-
-/* mapflag */
-#define MA_MAPFLAG_UVPROJECT (1 << 0)
-
-/* ray mirror fadeout */
-#define MA_RAYMIR_FADETOSKY 0
-#define MA_RAYMIR_FADETOMAT 1
-
-/* shadowonly_flag */
-#define MA_SO_OLD 0
-#define MA_SO_SHADOW 1
-#define MA_SO_SHADED 2
-
-/* shade_flag */
-#define MA_CUBIC 1
-#define MA_OBCOLOR 2
-#define MA_APPROX_OCCLUSION 4
-#define MA_GROUP_LOCAL 8
-
-/* diff_shader */
-#define MA_DIFF_LAMBERT 0
-#define MA_DIFF_ORENNAYAR 1
-#define MA_DIFF_TOON 2
-#define MA_DIFF_MINNAERT 3
-#define MA_DIFF_FRESNEL 4
-
-/* spec_shader */
-#define MA_SPEC_COOKTORR 0
-#define MA_SPEC_PHONG 1
-#define MA_SPEC_BLINN 2
-#define MA_SPEC_TOON 3
-#define MA_SPEC_WARDISO 4
-
-/* dynamode */
-// #define MA_DRAW_DYNABUTS 1 /* deprecated */
-#define MA_FH_NOR 2
-
/* ramps */
-#define MA_RAMP_IN_SHADER 0
-#define MA_RAMP_IN_ENERGY 1
-#define MA_RAMP_IN_NOR 2
-#define MA_RAMP_IN_RESULT 3
-
#define MA_RAMP_BLEND 0
#define MA_RAMP_ADD 1
#define MA_RAMP_MULT 2
@@@ -209,28 -373,59 +209,28 @@@
#define MA_RAMP_LINEAR 17
/* texco */
- #define TEXCO_ORCO 1
- #define TEXCO_REFL 2
- #define TEXCO_NORM 4
- #define TEXCO_GLOB 8
- #define TEXCO_UV 16
- #define TEXCO_OBJECT 32
- #define TEXCO_LAVECTOR 64
- #define TEXCO_VIEW 128
- #define TEXCO_STICKY_ 256 // DEPRECATED
- #define TEXCO_OSA 512
- #define TEXCO_WINDOW 1024
- #define NEED_UV 2048
- #define TEXCO_TANGENT 4096
+ #define TEXCO_ORCO (1 << 0)
+ #define TEXCO_REFL (1 << 1)
+ #define TEXCO_NORM (1 << 2)
+ #define TEXCO_GLOB (1 << 3)
+ #define TEXCO_UV (1 << 4)
+ #define TEXCO_OBJECT (1 << 5)
+ #define TEXCO_LAVECTOR (1 << 6)
+ #define TEXCO_VIEW (1 << 7)
+ #define TEXCO_STICKY_ (1 << 8) // DEPRECATED
+ #define TEXCO_OSA (1 << 9)
+ #define TEXCO_WINDOW (1 << 10)
+ #define NEED_UV (1 << 11)
+ #define TEXCO_TANGENT (1 << 12)
/* still stored in vertex->accum, 1 D */
- #define TEXCO_STRAND 8192
- #define TEXCO_PARTICLE 8192 /* strand is used for normal materials,
particle for halo materials */
- #define TEXCO_STRESS 16384
- #define TEXCO_SPEED 32768
+ #define TEXCO_STRAND (1 << 13)
+ #define TEXCO_PARTICLE (1 << 13) /* strand is used for normal materials,
particle for halo materials */
+ #define TEXCO_STRESS (1 << 14)
+ #define TEXCO_SPEED (1 << 15)
/* mapto */
- #define MAP_COL 1
- #define MAP_ALPHA 128
-#define MAP_COL (1 << 0)
-#define MAP_NORM (1 << 1)
-#define MAP_COLSPEC (1 << 2)
-#define MAP_COLMIR (1 << 3)
-#define MAP_VARS (((1 << 16) - 1) & ~((1 << 4) - 1))
-#define MAP_REF (1 << 4)
-#define MAP_SPEC (1 << 5)
-#define MAP_EMIT (1 << 6)
-#define MAP_ALPHA (1 << 7)
-#define MAP_HAR (1 << 8)
-#define MAP_RAYMIRR (1 << 9)
-#define MAP_TRANSLU (1 << 10)
-#define MAP_AMB (1 << 11)
-#define MAP_DISPLACE (1 << 12)
-#define MAP_WARP (1 << 13)
-// #define MAP_LAYER (1 << 14) /* unused */
-
-/* volume mapto - reuse definitions for now - a bit naughty! */
-#define MAP_DENSITY (1 << 7)
-#define MAP_EMISSION (1 << 6)
-#define MAP_EMISSION_COL (1 << 0)
-#define MAP_SCATTERING (1 << 4)
-#define MAP_TRANSMISSION_COL (1 << 3)
-#define MAP_REFLECTION_COL (1 << 2)
-#define MAP_REFLECTION (1 << 5)
-
-
-/* mapto for halo */
-//#define MAP_HA_COL (1 << 0)
-//#define MAP_HA_ALPHA (1 << 7)
-//#define MAP_HA_HAR (1 << 8)
-//#define MAP_HA_SIZE (1 << 1)
-//#define MAP_HA_ADD (1 << 6)
++#define MAP_COL (1 << 0)
++#define MAP_ALPHA (1 << 7)
/* pmapto */
/* init */
diff --cc source/blender/makesdna/DNA_node_types.h
index fe921cf96ac,e51f60ea65f..32792fcd85d
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -414,13 -411,12 +414,13 @@@ typedef struct bNodeTree
#define NTREE_TYPE_INIT 1
/* ntree->flag */
- #define NTREE_DS_EXPAND 1 /* for
animation editors */
- #define NTREE_COM_OPENCL 2 /* use opencl */
- #define NTREE_TWO_PASS 4 /* two pass */
- #define NTREE_COM_GROUPNODE_BUFFER 8 /* use groupnode buffers */
- #define NTREE_VIEWER_BORDER 16 /* use a border for
viewer nodes */
-#define NTREE_DS_EXPAND (1 << 0) /* for animation editors */
-#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
-#define NTREE_TWO_PASS (1 << 2) /* two pass */
-#define NTREE_COM_GROUPNODE_BUFFER (1 << 3) /* use groupnode buffers */
-#define NTREE_VIEWER_BORDER (1 << 4) /* use a border for viewer
nodes */
-#define NTREE_IS_LOCALIZED (1 << 5) /* tree is localized copy,
free when deleting node groups */
++#define NTREE_DS_EXPAND (1 << 0) /* for
animation editors */
++#define NTREE_COM_OPENCL (1 << 1) /* use opencl */
++#define NTREE_TWO_PASS (1 << 2) /* two
pass */
++#define NTREE_COM_
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
