Commit: 3b359f1feaa1b8784a6a5b1f1bd7d12a2d4acb20
Author: Porteries Tristan
Date:   Sun May 17 00:41:31 2015 +0200
Branches: master
https://developer.blender.org/rB3b359f1feaa1b8784a6a5b1f1bd7d12a2d4acb20

BGE: Fix T43761 No re-creation of display list after a mesh modification.

I also removed unused flags in RAS_ListRasterizer.cpp.

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

M       source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
M       source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h

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

diff --git 
a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp 
b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
index b3da5e1..34184f7 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
@@ -79,10 +79,6 @@ void RAS_ListSlot::RemoveList()
 
 void RAS_ListSlot::DrawList()
 {
-       if (m_flag &LIST_STREAM || m_flag& LIST_NOCREATE) {
-               RemoveList();
-               return;
-       }
        if (m_flag &LIST_MODIFY) {
                if (m_flag &LIST_CREATE) {
                        if (m_list == 0) {
@@ -115,7 +111,7 @@ void RAS_ListSlot::SetModified(bool mod)
        if (mod && !(m_flag & LIST_MODIFY)) {
                spit("Modifying list (" << m_list << ")");
                m_flag = m_flag &~ LIST_END;
-               m_flag |= LIST_STREAM;
+               m_flag |= LIST_MODIFY;
        }
 }
 
diff --git 
a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h 
b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
index d394c72..5e1c662 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
@@ -35,12 +35,9 @@ public:
 enum RAS_ListSlotFlags {
        LIST_CREATE             =1,
        LIST_MODIFY             =2,
-       LIST_STREAM             =4,
-       LIST_NOCREATE   =8,
-       LIST_BEGIN              =16,
-       LIST_END                =32,
-       LIST_REGEN              =64,
-       LIST_DERIVEDMESH=128,
+       LIST_BEGIN              =4,
+       LIST_END                =8,
+       LIST_DERIVEDMESH=16,
 };
 
 struct DerivedMesh;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to