[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25735] trunk/blender: missed these files last commit.

[Campbell Barton]

Revision: 25735
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25735
Author:   campbellbarton
Date:     2010-01-05 12:49:55 +0100 (Tue, 05 Jan 2010)

Log Message:
-----------
missed these files last commit.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_data_bone.py
    trunk/blender/source/blender/editors/render/render_preview.c
    trunk/blender/source/blender/makesdna/DNA_action_types.h

Modified: trunk/blender/release/scripts/ui/properties_data_bone.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_data_bone.py	2010-01-05 11:47:43 UTC (rev 25734)
+++ trunk/blender/release/scripts/ui/properties_data_bone.py	2010-01-05 11:49:55 UTC (rev 25735)
@@ -223,8 +223,11 @@
 
             if wide_ui:
                 col = split.column()
+
             col.label(text="Custom Shape:")
             col.prop(pchan, "custom_shape", text="")
+            if pchan.custom_shape:
+                col.prop_object(pchan, "custom_shape_transform", ob.pose, "bones", text="")
 
 
 class BONE_PT_inverse_kinematics(BoneButtonsPanel):

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2010-01-05 11:47:43 UTC (rev 25734)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2010-01-05 11:49:55 UTC (rev 25735)
@@ -1106,6 +1106,8 @@
 		case ID_LA:
 			return NC_LAMP;
 	}
+
+	return 0;
 }
 
 /* use same function for icon & shader, so the job manager

Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h	2010-01-05 11:47:43 UTC (rev 25734)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h	2010-01-05 11:49:55 UTC (rev 25735)
@@ -213,6 +213,7 @@
 	float		*path;				/* totpath x 3 x float */		// XXX depreceated... old animation system (armature only viz)
 	bMotionPath *mpath;				/* motion path cache for this bone */
 	struct Object *custom;			/* draws custom object instead of default bone shape */
+	struct bPoseChannel *custom_tx;	/* odd feature, display with another bones transform. needed in rare cases for advanced rigs, since the alternative is highly complicated - campbell */
 } bPoseChannel;