[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47822] trunk/blender/intern/cycles/render /object.cpp: Fix cycles object_flag array being allocated too big.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Jun 13 13:25:30 CEST 2012


Revision: 47822
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47822
Author:   blendix
Date:     2012-06-13 11:25:22 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
Fix cycles object_flag array being allocated too big.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/object.cpp

Modified: trunk/blender/intern/cycles/render/object.cpp
===================================================================
--- trunk/blender/intern/cycles/render/object.cpp	2012-06-13 10:35:41 UTC (rev 47821)
+++ trunk/blender/intern/cycles/render/object.cpp	2012-06-13 11:25:22 UTC (rev 47822)
@@ -147,7 +147,7 @@
 void ObjectManager::device_update_transforms(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
 {
 	float4 *objects = dscene->objects.resize(OBJECT_SIZE*scene->objects.size());
-	uint *object_flag = dscene->object_flag.resize(OBJECT_SIZE*scene->objects.size());
+	uint *object_flag = dscene->object_flag.resize(scene->objects.size());
 	int i = 0;
 	map<Mesh*, float> surface_area_map;
 	Scene::MotionType need_motion = scene->need_motion();




More information about the Bf-blender-cvs mailing list