[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57758] branches/soc-2013-bge/source/ blender/blenkernel/intern/object.c: When getting the mesh source object, levels that are not enabled for mesh LoD as well as non-mesh objects are now ignored , and the next appropriate LoD object is found.

[Daniel Stokes]

Revision: 57758
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57758
Author:   kupoman
Date:     2013-06-26 05:45:36 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
When getting the mesh source object, levels that are not enabled for mesh LoD 
as well as non-mesh objects are now ignored, and the next appropriate LoD 
object is found.

Modified Paths:
--------------
    branches/soc-2013-bge/source/blender/blenkernel/intern/object.c

Modified: branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-bge/source/blender/blenkernel/intern/object.c     
2013-06-26 05:18:08 UTC (rev 57757)
+++ branches/soc-2013-bge/source/blender/blenkernel/intern/object.c     
2013-06-26 05:45:36 UTC (rev 57758)
@@ -1001,13 +1001,12 @@
 struct Object *BKE_object_lod_meshob_get(struct Object *ob)
 {
        LodLevel *current = ob->currentlod;
-       Object *mesh_ob = current->source;
 
-       while( current->prev && (!current->use_mesh || current->source->type == 
OB_MESH)) {
+       while( current->prev && (!current->use_mesh || current->source->type != 
OB_MESH)) {
                current = current->prev;
        }
 
-       return mesh_ob;
+       return current->source;
 }
 
 SoftBody *copy_softbody(SoftBody *sb, int copy_caches)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs