[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18031] branches/blender2.5/blender/source /blender: 2.5
Ton Roosendaal
ton at blender.org
Tue Dec 23 20:47:33 CET 2008
Revision: 18031
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18031
Author: ton
Date: 2008-12-23 20:47:33 +0100 (Tue, 23 Dec 2008)
Log Message:
-----------
2.5
Object: converted the old horrible editobject.c, now as file:
editors/object/object_edit.c
Still lots of WIP, I've operatorified "Make Parent". Check here
the new API at work: http://pasteall.org/3650/c
IMPORTANT NOTE FOR BRECHT:
game property defines were clashing with RNA, i've renamed game
defines for now.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/property.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/Makefile
branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
branches/blender2.5/blender/source/blender/editors/object/Makefile
branches/blender2.5/blender/source/blender/editors/object/SConscript
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/makesdna/DNA_property_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_property.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/editors/object/object_ops.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/property.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/property.c 2008-12-23 16:07:24 UTC (rev 18030)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/property.c 2008-12-23 19:47:33 UTC (rev 18031)
@@ -103,19 +103,19 @@
prop->data= 0;
switch(prop->type) {
- case PROP_BOOL:
+ case GPROP_BOOL:
prop->poin= &prop->data;
break;
- case PROP_INT:
+ case GPROP_INT:
prop->poin= &prop->data;
break;
- case PROP_FLOAT:
+ case GPROP_FLOAT:
prop->poin= &prop->data;
break;
- case PROP_STRING:
+ case GPROP_STRING:
prop->poin= MEM_callocN(MAX_PROPSTRING, "property string");
break;
- case PROP_TIME:
+ case GPROP_TIME:
prop->poin= &prop->data;
break;
}
@@ -168,7 +168,7 @@
float fvalue, ftest;
switch(prop->type) {
- case PROP_BOOL:
+ case GPROP_BOOL:
if(BLI_strcasecmp(str, "true")==0) {
if(prop->data==1) return 0;
else return 1;
@@ -177,14 +177,14 @@
if(prop->data==0) return 0;
else return 1;
}
- /* no break, do prop_int too! */
+ /* no break, do GPROP_int too! */
- case PROP_INT:
+ case GPROP_INT:
return prop->data - atoi(str);
- case PROP_FLOAT:
- case PROP_TIME:
- // WARNING: untested for PROP_TIME
+ case GPROP_FLOAT:
+ case GPROP_TIME:
+ // WARNING: untested for GPROP_TIME
// function isn't used currently
fvalue= *((float *)&prop->data);
ftest= (float)atof(str);
@@ -192,7 +192,7 @@
else if( fvalue < ftest) return -1;
return 0;
- case PROP_STRING:
+ case GPROP_STRING:
return strcmp(prop->poin, str);
}
@@ -204,19 +204,19 @@
// extern int Gdfra; /* sector.c */
switch(prop->type) {
- case PROP_BOOL:
+ case GPROP_BOOL:
if(BLI_strcasecmp(str, "true")==0) prop->data= 1;
else if(BLI_strcasecmp(str, "false")==0) prop->data= 0;
else prop->data= (atoi(str)!=0);
break;
- case PROP_INT:
+ case GPROP_INT:
prop->data= atoi(str);
break;
- case PROP_FLOAT:
- case PROP_TIME:
+ case GPROP_FLOAT:
+ case GPROP_TIME:
*((float *)&prop->data)= (float)atof(str);
break;
- case PROP_STRING:
+ case GPROP_STRING:
strcpy(prop->poin, str);
break;
}
@@ -228,15 +228,15 @@
// extern int Gdfra; /* sector.c */
switch(prop->type) {
- case PROP_BOOL:
- case PROP_INT:
+ case GPROP_BOOL:
+ case GPROP_INT:
prop->data+= atoi(str);
break;
- case PROP_FLOAT:
- case PROP_TIME:
+ case GPROP_FLOAT:
+ case GPROP_TIME:
*((float *)&prop->data)+= (float)atof(str);
break;
- case PROP_STRING:
+ case GPROP_STRING:
/* strcpy(prop->poin, str); */
break;
}
@@ -250,15 +250,15 @@
if(str == NULL) return;
switch(prop->type) {
- case PROP_BOOL:
- case PROP_INT:
+ case GPROP_BOOL:
+ case GPROP_INT:
sprintf(str, "%d", prop->data);
break;
- case PROP_FLOAT:
- case PROP_TIME:
+ case GPROP_FLOAT:
+ case GPROP_TIME:
sprintf(str, "%f", *((float *)&prop->data));
break;
- case PROP_STRING:
+ case GPROP_STRING:
BLI_strncpy(str, prop->poin, MAX_PROPSTRING);
break;
}
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-23 16:07:24 UTC (rev 18030)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2008-12-23 19:47:33 UTC (rev 18031)
@@ -5867,8 +5867,8 @@
while (ob) {
prop= ob->prop.first;
while(prop) {
- if (prop->type == PROP_TIME) {
- // convert old PROP_TIME values from int to float
+ if (prop->type == GPROP_TIME) {
+ // convert old GPROP_TIME values from int to float
*((float *)&prop->data) = (float) prop->data;
}
Modified: branches/blender2.5/blender/source/blender/editors/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/Makefile 2008-12-23 16:07:24 UTC (rev 18030)
+++ branches/blender2.5/blender/source/blender/editors/Makefile 2008-12-23 19:47:33 UTC (rev 18031)
@@ -29,6 +29,6 @@
# Bounces make to subdirectories.
SOURCEDIR = source/blender/editors
-DIRS = animation datafiles screen space_outliner space_time space_view3d interface util space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer
+DIRS = animation object datafiles screen space_outliner space_time space_view3d interface util space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer
include nan_subdirs.mk
Added: branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c 2008-12-23 19:47:33 UTC (rev 18031)
@@ -0,0 +1,73 @@
+/**
+ * $Id:
+ *
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation, Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <stdlib.h>
+#include <math.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_action_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_space_types.h"
+#include "DNA_view3d_types.h"
+#include "DNA_windowmanager_types.h"
+
+#include "BLI_blenlib.h"
+
+#include "BKE_context.h"
+#include "BKE_depsgraph.h"
+#include "BKE_utildefines.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+
+/* ***************** depsgraph calls and anim updates ************* */
+
+/* generic update flush, reads from context Screen (layers) and scene */
+/* this is for compliancy, later it can do all windows etc */
+void ED_anim_dag_flush_update(bContext *C)
+{
+ Scene *scene= CTX_data_scene(C);
+ bScreen *screen= CTX_wm_screen(C);
+ int layer= scene->lay; /* as minimum this */
+
+ if(screen) {
+ ScrArea *sa;
+
+ /* get all used view3d layers */
+ for(sa= screen->areabase.first; sa; sa= sa->next) {
+ if(sa->spacetype==SPACE_VIEW3D)
+ layer |= ((View3D *)sa->spacedata.first)->lay;
+ }
+ }
+
+ DAG_scene_flush_update(scene, layer, 0);
+}
+
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h 2008-12-23 16:07:24 UTC (rev 18030)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h 2008-12-23 19:47:33 UTC (rev 18031)
@@ -281,6 +281,12 @@
/* ------------- xxx macros ----------------------- */
#define BEZSELECTED(bezt) ((bezt->f2 & SELECT) || (bezt->f1 & SELECT) || (bezt->f3 & SELECT))
+
+/* --------- anim_deps.c, animation updates -------- */
+
+/* generic update flush, reads from Context screen (layers) and scene */
+void ED_anim_dag_flush_update(struct bContext *C);
+
/* ************************************************* */
/* OPERATORS */
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_object.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_object.h 2008-12-23 16:07:24 UTC (rev 18030)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_object.h 2008-12-23 19:47:33 UTC (rev 18031)
@@ -28,6 +28,15 @@
#ifndef ED_OBJECT_H
#define ED_OBJECT_H
+struct wmWindowManager;
+struct Object;
+void ED_operatortypes_object(void);
+void ED_keymap_object(struct wmWindowManager *wm);
+
+/* cleanup */
+int object_data_is_libdata(struct Object *ob);
+int object_is_libdata(struct Object *ob);
+
#endif /* ED_OBJECT_H */
Added: branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h 2008-12-23 19:47:33 UTC (rev 18031)
@@ -0,0 +1,36 @@
+/**
+ * $Id:
+ *
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef ED_VIEW3D_H
+#define ED_VIEW3D_H
+
+/* ********* exports for space_view3d/ module ********** */
+
+float *give_cursor(Scene *scene, View3D *v3d);
+
+#endif /* ED_VIEW3D_H */
+
Modified: branches/blender2.5/blender/source/blender/editors/object/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/Makefile 2008-12-23 16:07:24 UTC (rev 18030)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list