[Bf-blender-cvs] [754bdbe] master: Cycles: Fix more wrong usages of RNA_id_pointer_create

[Sergey Sharybin]

Commit: 754bdbe4b41c6c04ed69c4061f4bf4f33013d224
Author: Sergey Sharybin
Date:   Thu Dec 11 17:11:23 2014 +0500
Branches: master
https://developer.blender.org/rB754bdbe4b41c6c04ed69c4061f4bf4f33013d224

Cycles: Fix more wrong usages of RNA_id_pointer_create

Title says it all, just be more careful in the future.

===================================================================

M       intern/cycles/blender/blender_python.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_python.cpp 
b/intern/cycles/blender/blender_python.cpp
index c48ec00..78a9631 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -113,15 +113,15 @@ static PyObject *create_func(PyObject *self, PyObject 
*args)
        BL::Scene scene(sceneptr);
 
        PointerRNA regionptr;
-       RNA_id_pointer_create((ID*)pylong_as_voidptr_typesafe(pyregion), 
&regionptr);
+       RNA_pointer_create(NULL, &RNA_Region, 
pylong_as_voidptr_typesafe(pyregion), &regionptr);
        BL::Region region(regionptr);
 
        PointerRNA v3dptr;
-       RNA_id_pointer_create((ID*)pylong_as_voidptr_typesafe(pyv3d), &v3dptr);
+       RNA_pointer_create(NULL, &RNA_SpaceView3D, 
pylong_as_voidptr_typesafe(pyv3d), &v3dptr);
        BL::SpaceView3D v3d(v3dptr);
 
        PointerRNA rv3dptr;
-       RNA_id_pointer_create((ID*)pylong_as_voidptr_typesafe(pyrv3d), 
&rv3dptr);
+       RNA_pointer_create(NULL, &RNA_RegionView3D, 
pylong_as_voidptr_typesafe(pyrv3d), &rv3dptr);
        BL::RegionView3D rv3d(rv3dptr);
 
        /* create session */
@@ -196,7 +196,7 @@ static PyObject *bake_func(PyObject *self, PyObject *args)
        void *b_result = PyLong_AsVoidPtr(pyresult);
 
        PointerRNA bakepixelptr;
-       RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pypixel_array), 
&bakepixelptr);
+       RNA_pointer_create(NULL, &RNA_BakePixel, 
PyLong_AsVoidPtr(pypixel_array), &bakepixelptr);
        BL::BakePixel b_bake_pixel(bakepixelptr);
 
        python_thread_state_save(&session->python_thread_state);
@@ -238,7 +238,7 @@ static PyObject *reset_func(PyObject *self, PyObject *args)
        BlenderSession *session = (BlenderSession*)PyLong_AsVoidPtr(pysession);
 
        PointerRNA dataptr;
-       RNA_id_pointer_create((ID*)PyLong_AsVoidPtr(pydata), &dataptr);
+       RNA_main_pointer_create((Main*)PyLong_AsVoidPtr(pydata), &dataptr);
        BL::BlendData b_data(dataptr);
 
        PointerRNA sceneptr;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs