[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58657] trunk/blender/source/blender: remove unused code from object convert and indent.

[Campbell Barton]

Revision: 58657
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58657
Author:   campbellbarton
Date:     2013-07-27 09:20:10 +0000 (Sat, 27 Jul 2013)
Log Message:
-----------
remove unused code from object convert and indent.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/text.c
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2013-07-27 09:19:03 UTC (rev 58656)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2013-07-27 09:20:10 UTC (rev 58657)
@@ -2624,10 +2624,6 @@
 		return;
 	}
 
-	if (!text) return;
-	if (!text->curl) return;
-	if (!text->sell) return;
-
 	/* insert spaces rather than tabs */
 	if (text->flags & TXT_TABSTOSPACES) {
 		add = tab_to_spaces;
@@ -2687,9 +2683,9 @@
 	/* hardcoded: TXT_TABSIZE = 4 spaces: */
 	int spaceslen = TXT_TABSIZE;
 
-	if (!text) return;
-	if (!text->curl) return;
-	if (!text->sell) return;
+	if (ELEM3(NULL, text, text->curl, text->sell)) {
+		return;
+	}
 
 	/* insert spaces rather than tabs */
 	if (text->flags & TXT_TABSTOSPACES) {

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2013-07-27 09:19:03 UTC (rev 58656)
+++ trunk/blender/source/blender/editors/object/object_add.c	2013-07-27 09:20:10 UTC (rev 58657)
@@ -1431,7 +1431,7 @@
 {
 	Main *bmain = CTX_data_main(C);
 	Scene *scene = CTX_data_scene(C);
-	Base *basen = NULL, *basact = NULL, *basedel = NULL;
+	Base *basen = NULL, *basact = NULL;
 	Object *ob, *ob1, *newob, *obact = CTX_data_active_object(C);
 	DerivedMesh *dm;
 	Curve *cu;
@@ -1687,14 +1687,6 @@
 			DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			((ID *)ob->data)->flag &= ~LIB_DOIT; /* flag not to convert this datablock again */
 		}
-
-		/* delete original if needed */
-		if (basedel) {
-			if (!keep_original)
-				ED_base_object_free_and_unlink(bmain, scene, basedel);
-
-			basedel = NULL;
-		}
 	}
 	CTX_DATA_END;
 

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-07-27 09:19:03 UTC (rev 58656)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-07-27 09:20:10 UTC (rev 58657)
@@ -1140,7 +1140,7 @@
 	 */
 	p = seq->prev;
 	while (p) {
-		if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) {
+		if ((!p->strip) || (!p->strip->stripdata)) {
 			p = p->prev;
 			continue;
 		}
@@ -1152,7 +1152,7 @@
 
 	p = seq->next;
 	while (p) {
-		if ((!p->strip) || (!p->strip->stripdata) || (!p->strip->stripdata->name)) {
+		if ((!p->strip) || (!p->strip->stripdata)) {
 			p = p->next;
 			continue;
 		}