Revision: 20910
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20910
Author: blendix
Date: 2009-06-16 03:04:17 +0200 (Tue, 16 Jun 2009)
Log Message:
-----------
RNA: python and animato updates for last commit.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
2009-06-16 00:52:21 UTC (rev 20909)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
2009-06-16 01:04:17 UTC (rev 20910)
@@ -545,7 +545,7 @@
return "ambient";
case MA_SPEC:
- return "specularity";
+ return "specular_reflection";
case MA_HARD:
return "specular_hardness";
Modified: branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-06-16 00:52:21 UTC (rev 20909)
+++ branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c
2009-06-16 01:04:17 UTC (rev 20910)
@@ -481,7 +481,9 @@
BPy_StructRNA *param= (BPy_StructRNA*)value;
int raise_error= 0;
if(data) {
- if(ptype == &RNA_AnyType) {
+ int flag = RNA_property_flag(prop);
+
+ if(flag & PROP_RNAPTR) {
if(value == Py_None)
memset(data, 0,
sizeof(PointerRNA));
else
@@ -1209,8 +1211,9 @@
{
PointerRNA newptr;
StructRNA *type= RNA_property_pointer_type(ptr, prop);
+ int flag = RNA_property_flag(prop);
- if(type == &RNA_AnyType) {
+ if(flag & PROP_RNAPTR) {
/* in this case we get the full ptr */
newptr= *(PointerRNA*)data;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
