Commit: 08675b94ef15b4ecb94ce0cefcbd4bba9cad60fa
Author: Clément Foucault
Date: Mon Jan 30 13:03:30 2017 +0100
Branches: clay-engine
https://developer.blender.org/rB08675b94ef15b4ecb94ce0cefcbd4bba9cad60fa
Fixed Engine name length
===================================================================
M source/blender/draw/intern/draw_manager.c
M source/blender/makesdna/DNA_material_types.h
M source/blender/makesdna/DNA_scene_types.h
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c
b/source/blender/draw/intern/draw_manager.c
index 3f5cc156f5..26525954c2 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 3717561dd0..824925634d 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 c042716fdc..1ae914eeea 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;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
