[Bf-blender-cvs] [628dad4f010] blender2.8: Fix building on Windows and blenderplayer linking after weightpaint engine

[Dalai Felinto]

Commit: 628dad4f010b9f18db08aaa0f587c493cb9731c2
Author: Dalai Felinto
Date:   Wed May 3 20:22:48 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB628dad4f010b9f18db08aaa0f587c493cb9731c2

Fix building on Windows and blenderplayer linking after weightpaint engine

Those problems were introduced on 20f95de6ba2d32dcff553251ff4de2efd5b76955.

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

M	source/blender/draw/modes/paint_weight_mode.c
M	source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blender/draw/modes/paint_weight_mode.c b/source/blender/draw/modes/paint_weight_mode.c
index 2819dcbc6c5..971e483ae81 100644
--- a/source/blender/draw/modes/paint_weight_mode.c
+++ b/source/blender/draw/modes/paint_weight_mode.c
@@ -49,20 +49,14 @@ typedef struct PAINT_WEIGHT_PassList {
 	struct DRWPass *vert_overlay;
 } PAINT_WEIGHT_PassList;
 
-typedef struct PAINT_WEIGHT_FramebufferList {
-} PAINT_WEIGHT_FramebufferList;
-
-typedef struct PAINT_WEIGHT_TextureList {
-} PAINT_WEIGHT_TextureList;
-
 typedef struct PAINT_WEIGHT_StorageList {
 	struct PAINT_WEIGHT_PrivateData *g_data;
 } PAINT_WEIGHT_StorageList;
 
 typedef struct PAINT_WEIGHT_Data {
 	void *engine_type;
-	PAINT_WEIGHT_FramebufferList *fbl;
-	PAINT_WEIGHT_TextureList *txl;
+	DRWViewportEmptyList *fbl;
+	DRWViewportEmptyList *txl;
 	PAINT_WEIGHT_PassList *psl;
 	PAINT_WEIGHT_StorageList *stl;
 } PAINT_WEIGHT_Data;
@@ -210,7 +204,6 @@ void PAINT_WEIGHT_collection_settings_create(IDProperty *properties)
 	BKE_collection_engine_property_add_bool(properties, "use_wire", false);
 }
 
-
 static const DrawEngineDataSize PAINT_WEIGHT_data_size = DRW_VIEWPORT_DATA_SIZE(PAINT_WEIGHT_Data);
 
 DrawEngineType draw_engine_paint_weight_type = {
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 0ab0059fd07..5f129be5f9b 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -701,6 +701,7 @@ void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, s
 void OBJECT_collection_settings_create(struct IDProperty *properties) RET_NONE
 void EDIT_MESH_collection_settings_create(struct IDProperty *properties) RET_NONE
 void EDIT_ARMATURE_collection_settings_create(struct IDProperty *properties) RET_NONE
+void PAINT_WEIGHT_collection_settings_create(struct IDProperty *properties) RET_NONE
 void DRW_object_engine_data_free(struct Object *ob) RET_NONE
 
 /* python */