[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57520] branches/soc-2013-depsgraph_mt/ source/blender/blenkernel: Use use_render argument rather than G. is_rendering to detect

[Sergey Sharybin]

Revision: 57520
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57520
Author:   nazgul
Date:     2013-06-17 13:34:17 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Use use_render argument rather than G.is_rendering to detect
whether preview or render settings need to be used in curves
and mballs tessellation.

This is not noticeable for artists yet, but this is silly
to use G.is_rendering anyway and using argument will help
making rendering and viewport working simultaneously in
the future.

Modified Paths:
--------------
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mball.h
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
    branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h	2013-06-17 13:13:46 UTC (rev 57519)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_curve.h	2013-06-17 13:34:17 UTC (rev 57520)
@@ -86,7 +86,7 @@
 float *BKE_curve_make_orco(struct Scene *scene, struct Object *ob, int *r_numVerts);
 float *BKE_curve_surf_make_orco(struct Object *ob);
 
-void BKE_curve_bevelList_make(struct Object *ob);
+void BKE_curve_bevelList_make(struct Object *ob, bool for_render);
 void BKE_curve_bevel_make(struct Scene *scene, struct Object *ob,  struct ListBase *disp, int forRender, int renderResolution);
 
 void BKE_curve_forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int it, int stride);

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mball.h
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mball.h	2013-06-17 13:13:46 UTC (rev 57519)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/BKE_mball.h	2013-06-17 13:34:17 UTC (rev 57520)
@@ -47,7 +47,7 @@
 
 void BKE_mball_cubeTable_free(void);
 
-void BKE_mball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+void BKE_mball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, bool for_render);
 bool BKE_mball_is_basis_for(struct Object *ob1, struct Object *ob2);
 bool BKE_mball_is_basis(struct Object *ob);
 struct Object *BKE_mball_basis_find(struct Scene *scene, struct Object *ob);

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c	2013-06-17 13:13:46 UTC (rev 57519)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/curve.c	2013-06-17 13:34:17 UTC (rev 57520)
@@ -2269,7 +2269,7 @@
 	}
 }
 
-void BKE_curve_bevelList_make(Object *ob)
+void BKE_curve_bevelList_make(Object *ob, bool for_render)
 {
 	/*
 	 * - convert all curves to polys, with indication of resol and flags for double-vertices
@@ -2325,7 +2325,7 @@
 			bl->nr = 0;
 		}
 		else {
-			if (G.is_rendering && cu->resolu_ren != 0)
+			if (for_render && cu->resolu_ren != 0)
 				resolu = cu->resolu_ren;
 			else
 				resolu = nu->resolu;

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c	2013-06-17 13:13:46 UTC (rev 57519)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/displist.c	2013-06-17 13:34:17 UTC (rev 57520)
@@ -716,7 +716,7 @@
 
 	if (ob->type == OB_MBALL) {
 		if (ob == BKE_mball_basis_find(scene, ob)) {
-			BKE_mball_polygonize(scene, ob, &ob->disp);
+			BKE_mball_polygonize(scene, ob, &ob->disp, false);
 			BKE_mball_texspace_calc(ob);
 
 			object_deform_mball(ob, &ob->disp);
@@ -728,7 +728,7 @@
 
 void BKE_displist_make_mball_forRender(Scene *scene, Object *ob, ListBase *dispbase)
 {
-	BKE_mball_polygonize(scene, ob, dispbase);
+	BKE_mball_polygonize(scene, ob, dispbase, true);
 	BKE_mball_texspace_calc(ob);
 
 	object_deform_mball(ob, dispbase);
@@ -1390,7 +1390,7 @@
 		if (!forOrco)
 			curve_calc_modifiers_pre(scene, ob, forRender, renderResolution, &originalVerts, &deformedVerts, &numVerts);
 
-		BKE_curve_bevelList_make(ob);
+		BKE_curve_bevelList_make(ob, forRender != FALSE);
 
 		/* If curve has no bevel will return nothing */
 		BKE_curve_bevel_make(scene, ob, &dlbev, forRender, renderResolution);

Modified: branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c	2013-06-17 13:13:46 UTC (rev 57519)
+++ branches/soc-2013-depsgraph_mt/source/blender/blenkernel/intern/mball.c	2013-06-17 13:34:17 UTC (rev 57520)
@@ -2269,7 +2269,7 @@
 	}
 }
 
-void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase)
+void BKE_mball_polygonize(Scene *scene, Object *ob, ListBase *dispbase, bool for_render)
 {
 	MetaBall *mb;
 	DispList *dl;
@@ -2282,7 +2282,7 @@
 	mball_count(&process, scene, ob);
 
 	if (process.totelem == 0) return;
-	if ((G.is_rendering == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
+	if ((for_render == FALSE) && (mb->flag == MB_UPDATE_NEVER)) return;
 	if (G.moving && mb->flag == MB_UPDATE_FAST) return;
 
 	process.thresh = mb->thresh;
@@ -2320,7 +2320,7 @@
 	}
 
 	/* width is size per polygonize cube */
-	if (G.is_rendering) {
+	if (for_render) {
 		width = mb->rendersize;
 	}
 	else {