Properties panel Pinning is broken #39562

New Issue

Maverick · 2014-04-02T14:52:14+02:00

Maverick commented

2014-04-02 14:52:14 +02:00

System Information
win7 64bit gtx titan i7

Blender Version
blender-2.70-6aa75d3-win64

Short description of error
Pin does not work when you have multiple scenes.

Exact steps for others to reproduce the error
Just create a new scene (Scene2) and change some settings, like disable the anti-aliasing.
Go back to the first scene(Scene1) and pin it.
Now if you change to Scene2 the Properties panel shows the name of the pinned scene (Scene1) but the panels are from Scene2..

Thank you.

**System Information** win7 64bit gtx titan i7 **Blender Version** blender-2.70-6aa75d3-win64 **Short description of error** Pin does not work when you have multiple scenes. **Exact steps for others to reproduce the error** Just create a new scene (Scene2) and change some settings, like disable the anti-aliasing. Go back to the first scene(Scene1) and pin it. Now if you change to Scene2 the Properties panel shows the name of the pinned scene (Scene1) but the panels are from Scene2.. Thank you.

Maverick commented

2014-04-02 14:52:14 +02:00

Changed status to: 'Open'

Maverick commented

2014-04-02 14:52:14 +02:00

Added subscriber: @dragostanasie

Bastien Montagne commented

2014-04-02 15:46:33 +02:00

Added subscriber: @mont29

Bastien Montagne self-assigned this 2014-04-02 15:46:56 +02:00

Bastien Montagne commented

2014-04-06 12:35:01 +02:00

Added subscriber: @brecht

Bastien Montagne commented

2014-04-06 12:35:01 +02:00

The following patch fix it (scene were simply ignored in the pinning handling process in buttons).

Now I’d rather get Brecht’s green light before committing this, esp. as I had to add a small "hack" to CTX_data_scene(), else it would crash on startup. I would assume it is safe, since Blender cannot work without a valid Scene anyway, but…

P32: Fix #39562

diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index eeb1f4b..9dc6242 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -873,7 +873,7 @@ Scene *CTX_data_scene(const bContext *C)
 {
        Scene *scene;
 
-       if (ctx_data_pointer_verify(C, "scene", (void *)&scene))
+       if (ctx_data_pointer_verify(C, "scene", (void *)&scene) && scene)
                return scene;
        else
                return C->data.scene;
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c
index a14ed72..f71ffd8 100644
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@ -656,7 +656,7 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts)
 /************************* Context Callback ************************/
 
 const char *buttons_context_dir[] = {
-       "texture_slot", "world", "object", "mesh", "armature", "lattice", "curve",
+       "texture_slot", "scene", "world", "object", "mesh", "armature", "lattice", "curve",
        "meta_ball", "lamp", "speaker", "camera", "material", "material_slot",
        "texture", "texture_user", "texture_user_property", "bone", "edit_bone",
        "pose_bone", "particle_system", "particle_system_editable", "particle_settings",
@@ -681,6 +681,10 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r
                        CTX_data_dir_set(result, buttons_context_dir);
                return 1;
        }
+       else if (CTX_data_equals(member, "scene")) {
+               set_pointer_type(path, result, &RNA_Scene);
+               return 1;
+       }
        else if (CTX_data_equals(member, "world")) {
                set_pointer_type(path, result, &RNA_World);
                return 1;

The following patch fix it (scene were simply ignored in the pinning handling process in buttons). Now I’d rather get Brecht’s green light before committing this, esp. as I had to add a small "hack" to `CTX_data_scene()`, else it would crash on startup. I would assume it is safe, since Blender cannot work without a valid Scene anyway, but… [P32: Fix #39562](https://archive.blender.org/developer/P32.txt) ```diff diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index eeb1f4b..9dc6242 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -873,7 +873,7 @@ Scene *CTX_data_scene(const bContext *C) { Scene *scene; - if (ctx_data_pointer_verify(C, "scene", (void *)&scene)) + if (ctx_data_pointer_verify(C, "scene", (void *)&scene) && scene) return scene; else return C->data.scene; diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index a14ed72..f71ffd8 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -656,7 +656,7 @@ void buttons_context_compute(const bContext *C, SpaceButs *sbuts) /************************* Context Callback ************************/ const char *buttons_context_dir[] = { - "texture_slot", "world", "object", "mesh", "armature", "lattice", "curve", + "texture_slot", "scene", "world", "object", "mesh", "armature", "lattice", "curve", "meta_ball", "lamp", "speaker", "camera", "material", "material_slot", "texture", "texture_user", "texture_user_property", "bone", "edit_bone", "pose_bone", "particle_system", "particle_system_editable", "particle_settings", @@ -681,6 +681,10 @@ int buttons_context(const bContext *C, const char *member, bContextDataResult *r CTX_data_dir_set(result, buttons_context_dir); return 1; } + else if (CTX_data_equals(member, "scene")) { + set_pointer_type(path, result, &RNA_Scene); + return 1; + } else if (CTX_data_equals(member, "world")) { set_pointer_type(path, result, &RNA_World); return 1; ```

Brecht Van Lommel commented

2014-04-07 00:35:20 +02:00

Looks good to me.