[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56372] trunk/blender: minor adjustment to vertex color baking, tag the meshes directly, no need to do via the objects.

Campbell Barton ideasman42 at gmail.com
Mon Apr 29 02:49:44 CEST 2013


Revision: 56372
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56372
Author:   campbellbarton
Date:     2013-04-29 00:49:44 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
minor adjustment to vertex color baking, tag the meshes directly, no need to do via the objects.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/object/object_bake.c

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-04-29 00:44:33 UTC (rev 56371)
+++ trunk/blender/CMakeLists.txt	2013-04-29 00:49:44 UTC (rev 56372)
@@ -420,8 +420,8 @@
 	macro(set_and_warn
 		_setting _val)
 		if(${${_setting}})
-            message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
-        endif()
+			message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
+		endif()
 		set(${_setting} ${_val})
 	endmacro()
 

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2013-04-29 00:44:33 UTC (rev 56371)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2013-04-29 00:49:44 UTC (rev 56372)
@@ -648,15 +648,12 @@
 
 	if (bkr->scene->r.bake_flag & R_BAKE_VCOL) {
 		/* update all tagged meshes */
-		Object *ob;
+		Mesh *me;
 		BLI_assert(BLI_thread_is_main());
-		for (ob = G.main->object.first; ob; ob = ob->id.next) {
-			if (ob->type == OB_MESH) {
-				Mesh *me = ob->data;
-				if (me->id.flag & LIB_DOIT) {
-					DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
-					BKE_mesh_tessface_clear(me);
-				}
+		for (me = G.main->mesh.first; me; me = me->id.next) {
+			if (me->id.flag & LIB_DOIT) {
+				DAG_id_tag_update(&me->id, OB_RECALC_DATA);
+				BKE_mesh_tessface_clear(me);
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list