Revision: 41565
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41565
Author: nazgul
Date: 2011-11-05 14:34:14 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Merging r41555 through r41563 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41555
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41563
Modified Paths:
--------------
branches/soc-2011-tomato/GNUmakefile
branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/object/object_relations.c
branches/soc-2011-tomato/source/blender/editors/render/render_preview.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_camera_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-tomato/source/blender/render/intern/source/initrender.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
Added Paths:
-----------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_lamp.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/lamp.c
Removed Paths:
-------------
branches/soc-2011-tomato/po/
branches/soc-2011-tomato/release/datafiles/locale/
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/release/datafiles/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41554
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-41563
Added: svn:externals
+ po https://svn.blender.org/svnroot/bf-translations/trunk/po
Modified: branches/soc-2011-tomato/GNUmakefile
===================================================================
--- branches/soc-2011-tomato/GNUmakefile 2011-11-05 14:26:18 UTC (rev
41564)
+++ branches/soc-2011-tomato/GNUmakefile 2011-11-05 14:34:14 UTC (rev
41565)
@@ -174,10 +174,10 @@
# Other Targets
#
translations:
- $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup
--python po/update_msg.py
- python3 po/update_pot.py
- python3 po/update_po.py
- python3 po/update_mo.py
+ $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup
--python po/tools/update_msg.py
+ python3 po/tools/update_pot.py
+ python3 po/tools/update_po.py
+ python3 po/tools/update_mo.py
# -----------------------------------------------------------------------------
Property changes on: branches/soc-2011-tomato/release/datafiles
___________________________________________________________________
Added: svn:externals
+ locale https://svn.blender.org/svnroot/bf-translations/trunk/locale
Copied: branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h (from
rev 41563, trunk/blender/source/blender/blenkernel/BKE_camera.h)
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h
(rev 0)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_camera.h
2011-11-05 14:34:14 UTC (rev 41565)
@@ -0,0 +1,71 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BKE_CAMERA_H
+#define BKE_CAMERA_H
+
+/** \file BKE_camera.h
+ * \ingroup bke
+ * \brief Camera datablock and utility functions.
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Camera;
+struct Object;
+struct RenderData;
+struct Scene;
+struct rctf;
+
+void *add_camera(const char *name);
+struct Camera *copy_camera(struct Camera *cam);
+void make_local_camera(struct Camera *cam);
+void free_camera(struct Camera *ca);
+
+float dof_camera(struct Object *ob);
+
+void object_camera_mode(struct RenderData *rd, struct Object *camera);
+void object_camera_intrinsics(struct Object *camera, struct Camera **cam_r,
short *is_ortho, float *shiftx, float *shifty,
+ float *clipsta, float *clipend, float *lens, float
*sensor_x, float *sensor_y, short *sensor_fit);
+void object_camera_matrix(
+ struct RenderData *rd, struct Object *camera, int winx, int
winy, short field_second,
+ float winmat[][4], struct rctf *viewplane, float *clipsta,
float *clipend, float *lens,
+ float *sensor_x, float *sensor_y, short *sensor_fit, float
*ycor,
+ float *viewdx, float *viewdy);
+
+void camera_view_frame_ex(struct Scene *scene, struct Camera *camera, float
drawsize, const short do_clip, const float scale[3],
+ float r_asp[2], float r_shift[2], float *r_drawsize,
float r_vec[4][3]);
+
+void camera_view_frame(struct Scene *scene, struct Camera *camera, float
r_vec[4][3]);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
Copied: branches/soc-2011-tomato/source/blender/blenkernel/BKE_lamp.h (from rev
41563, trunk/blender/source/blender/blenkernel/BKE_lamp.h)
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_lamp.h
(rev 0)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_lamp.h
2011-11-05 14:34:14 UTC (rev 41565)
@@ -0,0 +1,51 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef BKE_LAMP_H
+#define BKE_LAMP_H
+
+/** \file BKE_lamp.h
+ * \ingroup bke
+ * \brief General operations, lookup, etc. for blender lamps.
+ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Lamp;
+
+void *add_lamp(const char *name);
+struct Lamp *copy_lamp(struct Lamp *la);
+struct Lamp *localize_lamp(struct Lamp *la);
+void make_local_lamp(struct Lamp *la);
+void free_lamp(struct Lamp *la);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
2011-11-05 14:26:18 UTC (rev 41564)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
2011-11-05 14:34:14 UTC (rev 41565)
@@ -75,18 +75,7 @@
void unlink_object(struct Object *ob);
int exist_object(struct Object *obtest);
-void *add_camera(const char *name);
-struct Camera *copy_camera(struct Camera *cam);
-void make_local_camera(struct Camera *cam);
-float dof_camera(struct Object *ob);
-void *add_lamp(const char *name);
-struct Lamp *copy_lamp(struct Lamp *la);
-struct Lamp *localize_lamp(struct Lamp *la);
-void make_local_lamp(struct Lamp *la);
-void free_camera(struct Camera *ca);
-void free_lamp(struct Lamp *la);
-
struct Object *add_only_object(int type, const char *name);
struct Object *add_object(struct Scene *scene, int type);
@@ -140,20 +129,6 @@
int object_is_modified(struct Scene *scene, struct Object *ob);
-void object_camera_mode(struct RenderData *rd, struct Object *camera);
-void object_camera_intrinsics(struct Object *camera, struct Camera **cam_r,
short *is_ortho, float *shiftx, float *shifty,
- float *clipsta, float *clipend, float *lens, float
*sensor_x, float *sensor_y, short *sensor_fit);
-void object_camera_matrix(
- struct RenderData *rd, struct Object *camera, int winx, int
winy, short field_second,
- float winmat[][4], struct rctf *viewplane, float *clipsta,
float *clipend, float *lens,
- float *sensor_x, float *sensor_y, short *sensor_fit, float
*ycor,
- float *viewdx, float *viewdy);
-
-void camera_view_frame_ex(struct Scene *scene, struct Camera *camera, float
drawsize, const short do_clip, const float scale[3],
- float r_asp[2], float r_shift[2], float *r_drawsize,
float r_vec[4][3]);
-
-void camera_view_frame(struct Scene *scene, struct Camera *camera, float
r_vec[4][3]);
-
void object_relink(struct Object *ob);
struct MovieClip *object_get_movieclip(struct Scene *scene, struct Object *ob,
int use_default);
Modified: branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
2011-11-05 14:26:18 UTC (rev 41564)
+++ branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
2011-11-05 14:34:14 UTC (rev 41565)
@@ -76,6 +76,7 @@
intern/brush.c
intern/bullet.c
intern/bvhutils.c
+ intern/camera.c
intern/cdderivedmesh.c
intern/cloth.c
intern/collision.c
@@ -103,6 +104,7 @@
intern/implicit.c
intern/ipo.c
intern/key.c
+ intern/lamp.c
intern/lattice.c
intern/library.c
intern/material.c
@@ -162,6 +164,7 @@
BKE_brush.h
BKE_bullet.h
BKE_bvhutils.h
+ BKE_camera.h
BKE_cdderivedmesh.h
BKE_cloth.h
BKE_collision.h
@@ -187,6 +190,7 @@
BKE_image.h
BKE_ipo.h
BKE_key.h
+ BKE_lamp.h
BKE_lattice.h
BKE_library.h
BKE_main.h
Copied: branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
(from rev 41563, trunk/blender/source/blender/blenkernel/intern/camera.c)
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
(rev 0)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
2011-11-05 14:34:14 UTC (rev 41565)
@@ -0,0 +1,396 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
