diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-05-06 05:41:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-05-06 05:41:04 +0400 |
| commit | 013afe4314dbda5345d52abc84938fabd51a86b5 (patch) | |
| tree | 9d3c8bafb542939731518798354c42d180d7db8d | |
| parent | 31b52cf95365ea08ac46987700f08e893d1ccb7f (diff) | |
[#18690] mesh ripping allowed on multires
also fixed uninitialized variable use in the BGE when shaders are not supported.
| -rw-r--r-- | source/blender/src/editmesh_tools.c | 2 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_2DFilterManager.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/editmesh_tools.c b/source/blender/src/editmesh_tools.c index 377cb42e2f5..0fb072c1af4 100644 --- a/source/blender/src/editmesh_tools.c +++ b/source/blender/src/editmesh_tools.c @@ -5624,6 +5624,8 @@ void mesh_rip(void) 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; diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp index 176da51b183..239031866ca 100644 --- a/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp +++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp @@ -63,11 +63,9 @@ numberoffilters(0), need_tex_update(true) 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++) |