[Bf-blender-cvs] [76bb51c] opensubdiv-modifier: OpenSubdiv: Remove some code hacks
Sergey Sharybin
noreply at git.blender.org
Tue Jul 22 14:58:09 CEST 2014
Commit: 76bb51c90212fab724ef83cdf3c76c0f924cf4c4
Author: Sergey Sharybin
Date: Tue Jul 22 17:04:59 2014 +0600
Branches: opensubdiv-modifier
https://developer.blender.org/rB76bb51c90212fab724ef83cdf3c76c0f924cf4c4
OpenSubdiv: Remove some code hacks
===================================================================
M source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index e80bfa0..afc68b5 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -65,8 +65,6 @@
#include "BKE_paint.h"
#include "BKE_scene.h"
#include "BKE_subsurf.h"
-#include "BKE_global.h"
-#include "BKE_main.h"
#include "PIL_time.h"
@@ -2461,7 +2459,6 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
glShadeModel(drawSmooth ? GL_SMOOTH : GL_FLAT);
- tmp_tf.tpage = G.main->image.first;
if (drawParams != NULL)
drawParams(&tmp_tf, (mcol != NULL), mat_nr);
More information about the Bf-blender-cvs
mailing list