griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert makesrna part of r47158 because it broke building blenderplayer

Browse Source 
Apparently not supposed to call ED_* functions from there

Also added a missing "\n" that's been annoying me for a long while
This commit is contained in:
Dan Eicher
2012-05-29 13:59:31 +00:00
parent b1e8063d69
commit 45dbb715ee
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/makesrna.c
View File

@@ -3122,7 +3122,7 @@ int main(int argc, char **argv)
return_status = 1;
}
else {
fprintf(stderr, "Running makesrna");
fprintf(stderr, "Running makesrna\n");
makesrna_path = argv[0];
return_status = rna_preprocess(argv[1]);
}

14
source/blender/makesrna/intern/rna_scene.c
View File

@@ -304,7 +304,6 @@ EnumPropertyItem image_color_depth_items[] = {
#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 PointerRNA rna_Scene_objects_get(CollectionPropertyIterator *iter)
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); */