[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47178] trunk/blender/source/blender/ makesrna/intern: Revert makesrna part of r47158 because it broke building blenderplayer
Dan Eicher
dan at trollwerks.org
Tue May 29 15:59:32 CEST 2012
Revision: 47178
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47178
Author: dna
Date: 2012-05-29 13:59:31 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Revert makesrna part of r47158 because it broke building blenderplayer
Apparently not supposed to call ED_* functions from there
Also added a missing "\n" that's been annoying me for a long while
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47158
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/makesrna/intern/makesrna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/makesrna.c 2012-05-29 13:41:20 UTC (rev 47177)
+++ trunk/blender/source/blender/makesrna/intern/makesrna.c 2012-05-29 13:59:31 UTC (rev 47178)
@@ -3122,7 +3122,7 @@
return_status = 1;
}
else {
- fprintf(stderr, "Running makesrna");
+ fprintf(stderr, "Running makesrna\n");
makesrna_path = argv[0];
return_status = rna_preprocess(argv[1]);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-05-29 13:41:20 UTC (rev 47177)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2012-05-29 13:59:31 UTC (rev 47178)
@@ -304,7 +304,6 @@
#include "ED_mesh.h"
#include "ED_keyframing.h"
#include "ED_image.h"
-#include "ED_object.h"
#include "RE_engine.h"
@@ -339,17 +338,24 @@
static Base *rna_Scene_object_link(Scene *scene, bContext *C, ReportList *reports, Object *ob)
{
Scene *scene_act = CTX_data_scene(C);
- Base *base = ED_object_scene_link(reports, scene, ob);
+ Base *base;
- if (base == NULL) {
+ if (BKE_scene_base_find(scene, ob)) {
+ BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is already in scene \"%s\"", ob->id.name + 2, scene->id.name + 2);
return NULL;
}
+ base = BKE_scene_base_add(scene, ob);
+ id_us_plus(&ob->id);
+
+ /* this is similar to what object_add_type and BKE_object_add do */
+ base->lay = scene->lay;
+
/* when linking to an inactive scene don't touch the layer */
if (scene == scene_act)
ob->lay = base->lay;
- /* ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME; */
+ ob->recalc |= OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME;
/* slows down importers too much, run scene.update() */
/* DAG_scene_sort(G.main, scene); */
More information about the Bf-blender-cvs
mailing list