[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58826] trunk/blender/source/blender: code cleanup:

[Campbell Barton]

Revision: 58826
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58826
Author:   campbellbarton
Date:     2013-08-02 13:21:32 +0000 (Fri, 02 Aug 2013)
Log Message:
-----------
code cleanup:
- incorrect NULL check in logic UI drawing
- incorrect NULL check in octree quad test

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
    trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2013-08-02 10:07:15 UTC (rev 58825)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2013-08-02 13:21:32 UTC (rev 58826)
@@ -1009,8 +1009,6 @@
 	bSensor *sens = (bSensor *)ptr->data;
 	bArmatureSensor *as = (bArmatureSensor *) sens->data;
 	Object *ob = (Object *)ptr->id.data;
-	PointerRNA pose_ptr, pchan_ptr;
-	PropertyRNA *bones_prop= NULL;
 	uiLayout *row;
 
 	if (ob->type != OB_ARMATURE) {
@@ -1019,11 +1017,12 @@
 	}
 
 	if (ob->pose) {
+		PointerRNA pose_ptr, pchan_ptr;
+		PropertyRNA *bones_prop;
+
 		RNA_pointer_create((ID *)ob, &RNA_Pose, ob->pose, &pose_ptr);
 		bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
-	}
 
-	if (&pose_ptr.data) {
 		uiItemPointerR(layout, ptr, "bone", &pose_ptr, "bones", NULL, ICON_BONE_DATA);
 
 		if (RNA_property_collection_lookup_string(&pose_ptr, bones_prop, as->posechannel, &pchan_ptr))

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tools.c	2013-08-02 10:07:15 UTC (rev 58825)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tools.c	2013-08-02 13:21:32 UTC (rev 58826)
@@ -683,6 +683,10 @@
 		outliner_do_object_operation(C, scene, soops, &soops->tree, item_rename_cb);
 		str = "Rename Object";
 	}
+	else {
+		BLI_assert(0);
+		return OPERATOR_CANCELLED;
+	}
 
 	ED_undo_push(C, str);
 	

Modified: trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp	2013-08-02 10:07:15 UTC (rev 58825)
+++ trunk/blender/source/blender/render/intern/raytrace/rayobject_octree.cpp	2013-08-02 13:21:32 UTC (rev 58826)
@@ -521,7 +521,7 @@
 	copy_v3_v3(co1, face->v1);
 	copy_v3_v3(co2, face->v2);
 	copy_v3_v3(co3, face->v3);
-	if (face->v4)
+	if (RE_rayface_isQuad(face))
 		copy_v3_v3(co4, face->v4);
 
 	for (c = 0; c < 3; c++) {