Commit: a5176676b8119465091c6e3956ea0a3d07fe96a7
Author: Dalai Felinto
Date: Mon Nov 24 11:41:30 2014 -0200
Branches: multiview
https://developer.blender.org/rBa5176676b8119465091c6e3956ea0a3d07fe96a7
>From review: small changes
* Remove double promotion as suggested on review
* Remove extra space and lines in python file
* Undo unecessary change in BKE_camera_object_dof_distance
* Rename stereo_3d operator to set_stereo_3d
* Remove unused variable in python
* Remove unecessary include
===================================================================
M release/scripts/startup/bl_ui/properties_render_layer.py
M release/scripts/startup/bl_ui/space_info.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_camera.h
M source/blender/blenkernel/intern/camera.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_stereo.c
M source/blender/windowmanager/wm.h
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py
b/release/scripts/startup/bl_ui/properties_render_layer.py
index 6fb4d54..213438f 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -180,7 +180,7 @@ class RENDERLAYER_UL_renderviews(UIList):
class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
- bl_label = "Views"
+ bl_label = "Views"
COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw_header(self, context):
@@ -194,7 +194,6 @@ class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel):
rd = scene.render
rv = rd.views.active
-
layout.active = rd.use_multiple_views
basic_stereo = rd.views_setup == 'STEREO_3D'
diff --git a/release/scripts/startup/bl_ui/space_info.py
b/release/scripts/startup/bl_ui/space_info.py
index 62498f0..2688557 100644
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -270,7 +270,7 @@ class INFO_MT_window(Menu):
layout.operator("wm.console_toggle", icon='CONSOLE')
layout.separator()
- layout.operator("wm.stereo_3d", icon='CAMERA_STEREO')
+ layout.operator("wm.set_stereo_3d", icon='CAMERA_STEREO')
class INFO_MT_help(Menu):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 3f32ff9..197765e 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2866,8 +2866,6 @@ class VIEW3D_PT_view3d_stereo(Panel):
scene = context.scene
multiview = scene.render.use_multiple_views
- engine = scene.render.engine
-
return context.space_data and multiview
def draw(self, context):
diff --git a/source/blender/blenkernel/BKE_camera.h
b/source/blender/blenkernel/BKE_camera.h
index c14f3de..d2f79de 100644
--- a/source/blender/blenkernel/BKE_camera.h
+++ b/source/blender/blenkernel/BKE_camera.h
@@ -36,7 +36,6 @@
extern "C" {
#endif
-#include "DNA_scene_types.h"
#include "DNA_vec_types.h"
struct Camera;
diff --git a/source/blender/blenkernel/intern/camera.c
b/source/blender/blenkernel/intern/camera.c
index e5ee54a..4340d66 100644
--- a/source/blender/blenkernel/intern/camera.c
+++ b/source/blender/blenkernel/intern/camera.c
@@ -71,8 +71,8 @@ void *BKE_camera_add(Main *bmain, const char *name)
cam->passepartalpha = 0.5f;
/* stereoscopy 3d */
- cam->stereo.interocular_distance = 0.065;
- cam->stereo.convergence_distance = 30.f * 0.065;
+ cam->stereo.interocular_distance = 0.065f;
+ cam->stereo.convergence_distance = 30.f * 0.065f;
return cam;
}
@@ -156,7 +156,7 @@ void BKE_camera_object_mode(RenderData *rd, Object *cam_ob)
/* get the camera's dof value, takes the dof object into account */
float BKE_camera_object_dof_distance(Object *ob)
{
- Camera *cam = ob->data;
+ Camera *cam = (Camera *)ob->data;
if (ob->type != OB_CAMERA)
return 0.0f;
if (cam->dof_ob) {
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 1fad150..49ae9a4 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -4705,20 +4705,20 @@ static void operatortype_ghash_free_cb(wmOperatorType
*ot)
/* ******************************************************* */
/* toggle 3D for current window, turning it fullscreen if needed */
-static void WM_OT_stereo3d(wmOperatorType *ot)
+static void WM_OT_set_stereo3d(wmOperatorType *ot)
{
PropertyRNA *prop;
- ot->name = "Stereo 3D";
- ot->idname = "WM_OT_stereo_3d";
+ ot->name = "Set Stereo 3D";
+ ot->idname = "WM_OT_set_stereo_3d";
ot->description = "Toggle 3D stereo support for current window (or
change the display mode)";
- ot->exec = wm_stereo3d_exec;
- ot->invoke = wm_stereo3d_invoke;
+ ot->exec = wm_set_stereo3d_exec;
+ ot->invoke = wm_set_stereo3d_invoke;
ot->poll = WM_operator_winactive;
- ot->ui = wm_stereo3d_draw;
- ot->check = wm_stereo3d_check;
- ot->cancel = wm_stereo3d_cancel;
+ ot->ui = wm_set_stereo3d_draw;
+ ot->check = wm_set_stereo3d_check;
+ ot->cancel = wm_set_stereo3d_cancel;
prop = RNA_def_enum(ot->srna, "display_mode", stereo3d_display_items,
S3D_DISPLAY_ANAGLYPH, "Display Mode", "");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
@@ -4779,7 +4779,7 @@ void wm_operatortype_init(void)
WM_operatortype_append(WM_OT_call_menu);
WM_operatortype_append(WM_OT_call_menu_pie);
WM_operatortype_append(WM_OT_radial_control);
- WM_operatortype_append(WM_OT_stereo3d);
+ WM_operatortype_append(WM_OT_set_stereo3d);
#if defined(WIN32)
WM_operatortype_append(WM_OT_console_toggle);
#endif
diff --git a/source/blender/windowmanager/intern/wm_stereo.c
b/source/blender/windowmanager/intern/wm_stereo.c
index 2398fca..9281b1e 100644
--- a/source/blender/windowmanager/intern/wm_stereo.c
+++ b/source/blender/windowmanager/intern/wm_stereo.c
@@ -524,7 +524,7 @@ static bool wm_stereo3d_set_properties(bContext *C,
wmOperator *op)
return is_set;
}
-static void wm_stereo3d_init(bContext *C, wmOperator *op)
+static void wm_set_stereo3d_init(bContext *C, wmOperator *op)
{
Stereo3dData *s3dd;
wmWindow *win = CTX_wm_window(C);
@@ -535,7 +535,7 @@ static void wm_stereo3d_init(bContext *C, wmOperator *op)
s3dd->stereo3d_format = *win->stereo3d_format;
}
-int wm_stereo3d_exec(bContext *C, wmOperator *op)
+int wm_set_stereo3d_exec(bContext *C, wmOperator *op)
{
wmWindowManager *wm = CTX_wm_manager(C);
wmWindow *win = CTX_wm_window(C);
@@ -573,17 +573,17 @@ int wm_stereo3d_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-int wm_stereo3d_invoke(bContext *C, wmOperator *op, const wmEvent
*UNUSED(event))
+int wm_set_stereo3d_invoke(bContext *C, wmOperator *op, const wmEvent
*UNUSED(event))
{
- wm_stereo3d_init(C, op);
+ wm_set_stereo3d_init(C, op);
if (wm_stereo3d_set_properties(C, op))
- return wm_stereo3d_exec(C, op);
+ return wm_set_stereo3d_exec(C, op);
else
return WM_operator_props_dialog_popup(C, op, 250, 100);
}
-void wm_stereo3d_draw(bContext *C, wmOperator *op)
+void wm_set_stereo3d_draw(bContext *C, wmOperator *op)
{
wmWindow *win = CTX_wm_window(C);
Stereo3dFormat *stereo3d_format;
@@ -628,12 +628,12 @@ void wm_stereo3d_draw(bContext *C, wmOperator *op)
}
}
-bool wm_stereo3d_check(bContext *UNUSED(C), wmOperator *UNUSED(op))
+bool wm_set_stereo3d_check(bContext *UNUSED(C), wmOperator *UNUSED(op))
{
return true;
}
-void wm_stereo3d_cancel(bContext *C, wmOperator *op)
+void wm_set_stereo3d_cancel(bContext *C, wmOperator *op)
{
Stereo3dData *s3dd = op->customdata;
wmWindow *win = CTX_wm_window(C);
diff --git a/source/blender/windowmanager/wm.h
b/source/blender/windowmanager/wm.h
index d99d655..9125ca8 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -78,11 +78,11 @@ void wm_autosave_location(char *filepath);
/* wm_stereo.c */
void wm_method_draw_stereo(const bContext *C, wmWindow *win);
-int wm_stereo3d_exec(bContext *C, wmOperator *op);
-int wm_stereo3d_invoke(bContext *C, wmOperator *op, const wmEvent *event);
-void wm_stereo3d_draw(bContext *C, wmOperator *op);
-bool wm_stereo3d_check(bContext *C, wmOperator *op);
-void wm_stereo3d_cancel(bContext *C, wmOperator *op);
+int wm_set_stereo3d_exec(bContext *C, wmOperator *op);
+int wm_set_stereo3d_invoke(bContext *C, wmOperator *op, const wmEvent *event);
+void wm_set_stereo3d_draw(bContext *C, wmOperator *op);
+bool wm_set_stereo3d_check(bContext *C, wmOperator *op);
+void wm_set_stereo3d_cancel(bContext *C, wmOperator *op);
/* init operator properties */
void wm_open_init_load_ui(wmOperator *op, bool use_prefs);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
