diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2017-01-30 15:03:30 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2017-01-30 15:03:30 +0300 |
| commit | 08675b94ef15b4ecb94ce0cefcbd4bba9cad60fa (patch) | |
| tree | bd6c61bfb1d5f2b3fc6479130eaef15d7f9f4720 | |
| parent | ba4a30c71baffde4af8e94257f2758a1f35aa23b (diff) | |
Fixed Engine name length
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 3f5cc156f58..26525954c23 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -859,7 +859,7 @@ void *DRW_material_settings_get(Material *ma, const char *engine_name, void **ru if (ms == NULL) { ms = MEM_callocN(sizeof(RenderEngineSettings), "RenderEngineSettings"); - BLI_strncpy(ms->name, engine_name, 64); + BLI_strncpy(ms->name, engine_name, 32); /* TODO make render_settings_create a polymorphic function */ if (STREQ(engine_name, RE_engine_id_BLENDER_CLAY)) { @@ -894,7 +894,7 @@ void *DRW_render_settings_get(Scene *scene, const char *engine_name, void **runt if (rs == NULL) { rs = MEM_callocN(sizeof(RenderEngineSettings), "RenderEngineSettings"); - BLI_strncpy(rs->name, engine_name, 64); + BLI_strncpy(rs->name, engine_name, 32); /* TODO make render_settings_create a polymorphic function */ if (STREQ(engine_name, RE_engine_id_BLENDER_CLAY)) { diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 3717561dd0b..824925634d4 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -93,7 +93,7 @@ typedef struct TexPaintSlot { /* Material Engine Settings */ typedef struct MaterialEngineSettings { struct MaterialEngineSettings *next, *prev; - char name[64]; /* engine name - MAX_NAME */ + char name[32]; /* engine name - MAX_NAME */ void *runtime; /* To be free on file read */ void *data; } MaterialEngineSettings; diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index c042716fdce..1ae914eeea2 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -550,7 +550,7 @@ typedef enum BakePassFilter { typedef struct RenderEngineSettings { struct RenderEngineSettings *next, *prev; - char name[64]; /* engine name - MAX_NAME */ + char name[32]; /* engine name */ void *runtime; /* Here to be free on file read */ void *data; } RenderEngineSettings; |