bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

[#18690] mesh ripping allowed on multires

Browse Source 
also fixed uninitialized variable use in the BGE when shaders are not supported.
This commit is contained in:
Campbell Barton 2009-05-06 01:41:04 +00:00
parent 31b52cf953
commit 013afe4314
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/editmesh_tools.c
View File

@ -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;

4
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
View File

@ -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++)