[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52455] trunk/blender/source/blender/bmesh : fix own error - remove doubles slot name.

[Campbell Barton]

Revision: 52455
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52455
Author:   campbellbarton
Date:     2012-11-22 01:00:40 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
fix own error - remove doubles slot name.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
    trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-11-21 23:43:30 UTC (rev 52454)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-11-22 01:00:40 UTC (rev 52455)
@@ -80,7 +80,7 @@
 };
 
 /* Dummy slot so there is something to return when slot name lookup fails */
-static BMOpSlot BMOpEmptySlot = {0};
+// static BMOpSlot BMOpEmptySlot = {0};
 
 void BMO_op_flag_enable(BMesh *UNUSED(bm), BMOperator *op, const int op_flag)
 {
@@ -252,8 +252,10 @@
 {
 	int slot_code = bmo_name_to_slotcode_check(slot_args, identifier);
 
-	if (slot_code < 0) {
-		return &BMOpEmptySlot;
+	if (UNLIKELY(slot_code < 0)) {
+		//return &BMOpEmptySlot;
+		BLI_assert(0);
+		NULL;  /* better crash */
 	}
 
 	return &slot_args[slot_code];

Modified: trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c	2012-11-21 23:43:30 UTC (rev 52454)
+++ trunk/blender/source/blender/bmesh/operators/bmo_removedoubles.c	2012-11-22 01:00:40 UTC (rev 52455)
@@ -579,7 +579,7 @@
 void bmo_find_doubles_exec(BMesh *bm, BMOperator *op)
 {
 	BMOpSlot *slot_targetmap_out;
-	slot_targetmap_out = BMO_slot_get(op->slots_out, "targetmap");
+	slot_targetmap_out = BMO_slot_get(op->slots_out, "targetmap.out");
 	bmesh_find_doubles_common(bm, op,
 	                          op, slot_targetmap_out);
 }