Revision: 20078
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20078
Author: campbellbarton
Date: 2009-05-06 03:41:04 +0200 (Wed, 06 May 2009)
Log Message:
-----------
[#18690] mesh ripping allowed on multires
also fixed uninitialized variable use in the BGE when shaders are not supported.
Modified Paths:
--------------
trunk/blender/source/blender/src/editmesh_tools.c
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
Modified: trunk/blender/source/blender/src/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/src/editmesh_tools.c 2009-05-06 00:18:06 UTC
(rev 20077)
+++ trunk/blender/source/blender/src/editmesh_tools.c 2009-05-06 01:41:04 UTC
(rev 20078)
@@ -5624,6 +5624,8 @@
float projectMat[4][4], viewMat[4][4], vec[3], dist, mindist;
short doit= 1, mval[2],propmode,prop;
+ if(multires_test()) return;
+
propmode = G.scene->prop_mode;
G.scene->prop_mode = 0;
prop = G.scene->proportional;
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
2009-05-06 00:18:06 UTC (rev 20077)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
2009-05-06 01:41:04 UTC (rev 20078)
@@ -63,11 +63,9 @@
isshadersupported = GLEW_ARB_shader_objects &&
GLEW_ARB_fragment_shader && GLEW_ARB_multitexture;
+ /* used to return before 2.49 but need to initialize values so dont */
if(!isshadersupported)
- {
std::cout<<"shaders not supported!" << std::endl;
- return;
- }
int passindex;
for(passindex =0; passindex<MAX_RENDER_PASS; passindex++)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
