[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25893] trunk/blender: Fix [#20600] First added camera is not made active

[Matt Ebb]

Revision: 25893
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25893
Author:   broken
Date:     2010-01-11 07:57:41 +0100 (Mon, 11 Jan 2010)

Log Message:
-----------
Fix [#20600] First added camera is not made active

Also forced view align on when adding cameras

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/editors/object/object_intern.h
    trunk/blender/source/blender/editors/object/object_ops.c

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2010-01-11 06:32:05 UTC (rev 25892)
+++ trunk/blender/release/scripts/ui/space_info.py	2010-01-11 06:57:41 UTC (rev 25893)
@@ -214,7 +214,7 @@
         layout.operator("object.add", text="Empty", icon='OUTLINER_OB_EMPTY').type = 'EMPTY'
         layout.separator()
 
-        layout.operator("object.add", text="Camera", icon='OUTLINER_OB_CAMERA').type = 'CAMERA'
+        layout.operator("object.camera_add", text="Camera", icon='OUTLINER_OB_CAMERA')
         layout.operator_context = 'EXEC_SCREEN'
         layout.operator_menu_enum("object.lamp_add", "type", 'LAMP', text="Lamp", icon='OUTLINER_OB_LAMP')
         layout.separator()

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-01-11 06:32:05 UTC (rev 25892)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-01-11 06:57:41 UTC (rev 25893)
@@ -298,6 +298,7 @@
 	int enter_editmode;
 	float loc[3], rot[3];
 	
+	object_add_generic_invoke_options(C, op);
 	ED_object_add_generic_get_opts(op, loc, rot, &enter_editmode);
 
 	if(type==PFIELD_GUIDE) {
@@ -357,6 +358,54 @@
 	ED_object_add_generic_props(ot, TRUE);
 }
 
+/* ***************** Add Camera *************** */
+
+static int object_camera_add_exec(bContext *C, wmOperator *op)
+{
+	View3D *v3d = CTX_wm_view3d(C);
+	RegionView3D *rv3d= CTX_wm_region_view3d(C);
+	Scene *scene= CTX_data_scene(C);
+	Object *ob;
+	int enter_editmode;
+	float loc[3], rot[3];
+	
+	/* force view align for cameras */
+	RNA_boolean_set(op->ptr, "view_align", 1);
+	
+	object_add_generic_invoke_options(C, op);
+	ED_object_add_generic_get_opts(op, loc, rot, &enter_editmode);
+
+	ob= ED_object_add_type(C, OB_CAMERA, loc, rot, FALSE);
+	
+	if (v3d) {
+		if (v3d->camera == NULL)
+			v3d->camera = ob;
+		if (v3d->scenelock && scene->camera==NULL) {
+			scene->camera = ob;
+		}
+	}
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_camera_add(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Add Camera";
+	ot->description = "Add a camera object to the scene.";
+	ot->idname= "OBJECT_OT_camera_add";
+	
+	/* api callbacks */
+	ot->exec= object_camera_add_exec;
+	ot->poll= ED_operator_scene_editable;
+	
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+		
+	ED_object_add_generic_props(ot, TRUE);
+}
+
+
 /* ***************** add primitives *************** */
 
 static EnumPropertyItem prop_curve_types[] = {
@@ -583,6 +632,7 @@
 	RNA_def_enum(ot->srna, "type", prop_metaball_types, 0, "Primitive", "");
 	ED_object_add_generic_props(ot, TRUE);
 }
+
 static int object_add_text_exec(bContext *C, wmOperator *op)
 {
 	Object *obedit= CTX_data_edit_object(C);

Modified: trunk/blender/source/blender/editors/object/object_intern.h
===================================================================
--- trunk/blender/source/blender/editors/object/object_intern.h	2010-01-11 06:32:05 UTC (rev 25892)
+++ trunk/blender/source/blender/editors/object/object_intern.h	2010-01-11 06:57:41 UTC (rev 25893)
@@ -100,6 +100,7 @@
 void OBJECT_OT_armature_add(struct wmOperatorType *ot);
 void OBJECT_OT_lamp_add(struct wmOperatorType *ot);
 void OBJECT_OT_effector_add(struct wmOperatorType *ot);
+void OBJECT_OT_camera_add(struct wmOperatorType *ot);
 void OBJECT_OT_group_instance_add(struct wmOperatorType *ot);
 
 void OBJECT_OT_duplicates_make_real(struct wmOperatorType *ot);

Modified: trunk/blender/source/blender/editors/object/object_ops.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_ops.c	2010-01-11 06:32:05 UTC (rev 25892)
+++ trunk/blender/source/blender/editors/object/object_ops.c	2010-01-11 06:57:41 UTC (rev 25893)
@@ -117,6 +117,7 @@
 	WM_operatortype_append(OBJECT_OT_surface_add);
 	WM_operatortype_append(OBJECT_OT_armature_add);
 	WM_operatortype_append(OBJECT_OT_lamp_add);
+	WM_operatortype_append(OBJECT_OT_camera_add);
 	WM_operatortype_append(OBJECT_OT_add);
 	WM_operatortype_append(OBJECT_OT_effector_add);
 	WM_operatortype_append(OBJECT_OT_group_instance_add);