[Bf-blender-cvs] [5f20911a448] soc-2017-vertex_paint: increase the color layer to 64

Darshan Kadu noreply at git.blender.org
Wed Aug 2 09:13:03 CEST 2017


Commit: 5f20911a44884c4ab54d846d08df8c36da8ed36d
Author: Darshan Kadu
Date:   Wed Aug 2 12:40:00 2017 +0530
Branches: soc-2017-vertex_paint
https://developer.blender.org/rB5f20911a44884c4ab54d846d08df8c36da8ed36d

increase the color layer to 64

===================================================================

M	source/blender/makesdna/DNA_customdata_types.h
M	source/blender/render/extern/include/RE_shader_ext.h

===================================================================

diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 2d1ffaa53eb..cab8c13e54f 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -195,7 +195,7 @@ enum {
 
 /* Limits */
 #define MAX_MTFACE  8
-#define MAX_MCOL    8
+#define MAX_MCOL    64
 
 #define DYNTOPO_NODE_NONE -1
 
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index b64c0c8fc52..5bd3bf6c89c 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -142,7 +142,7 @@ typedef struct ShadeInput {
 	float tangents[8][4]; /* 8 = MAX_MTFACE */
 
 	ShadeInputUV uv[8];   /* 8 = MAX_MTFACE */
-	ShadeInputCol col[8]; /* 8 = MAX_MCOL */
+	ShadeInputCol col[64]; /* 64 = MAX_MCOL */
 	int totuv, totcol, actuv, actcol;
 	
 	/* dx/dy OSA coordinates */




More information about the Bf-blender-cvs mailing list