diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-22 08:24:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-22 08:24:01 +0400 |
commit | d1a211188b588456b8ca76effb11e639442e8c10 (patch) | |
tree | 5830bfe01ff9b6ad8e11e2fdf926a9bf7830034a /source/blender/makesdna | |
parent | 043e1536e5876f194923f1f6ab957c3396195210 (diff) |
property change reporting now uses the context again, rather then checking a dir() on context, hard-code common paths.
eg:
bpy.context.scene.render.resolution_x = 1921
bpy.context.object.data.use_auto_smooth = True
bpy.context.object.active_material.diffuse_intensity = 1
bpy.context.scene.world.exposure = 0.1
also remove duplicate GS() defines
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_ID.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 0c5e17c1c7d..cf3f6176ba7 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -231,7 +231,8 @@ typedef struct PreviewImage { #ifdef GS # undef GS #endif -#define GS(a) (*((short *)(a))) +// #define GS(a) (*((short *)(a))) +#define GS(a) (CHECK_TYPE_INLINE(a, const char), (*((short *)(a)))) #define ID_NEW(a) if ( (a) && (a)->id.newid ) (a) = (void *)(a)->id.newid #define ID_NEW_US(a) if ( (a)->id.newid) { (a) = (void *)(a)->id.newid; (a)->id.us++; } diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 9fa35cd667c..6cf7133cb4d 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -347,6 +347,9 @@ typedef struct DupliObject { #define OB_DATA_SUPPORT_ID(_id_type) \ (ELEM8(_id_type, ID_ME, ID_CU, ID_MB, ID_LA, ID_SPK, ID_CA, ID_LT, ID_AR)) +#define OB_DATA_SUPPORT_ID_CASE \ + ID_ME: case ID_CU: case ID_MB: case ID_LA: case ID_SPK: case ID_CA: case ID_LT: case ID_AR + /* partype: first 4 bits: type */ #define PARTYPE 15 #define PAROBJECT 0 |