Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-09-12 03:28:23 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-09-12 03:28:23 +0400
commitf16047c2df1e8be56bf76524f9eb1fa5ecde2176 (patch)
treecc7fbd339fb547e163e7e2fd552d05d5e960ccbe /source/blender/blenkernel
parent494687908c0d0a66abd17b33536dce56b8925309 (diff)
Better fix for #36688.
Throw a python error if user attempts to use CurveMap without calling CurveMapping.initialize() first. Added access to the initialize function to CurveMapping on RNA level. Thanks to Campbel for the help and remarks!
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_colortools.h1
-rw-r--r--source/blender/blenkernel/intern/colortools.c13
2 files changed, 0 insertions, 14 deletions
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index e703f189d6f..e0b7e68bafc 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -64,7 +64,6 @@ void curvemapping_changed_all(struct CurveMapping *cumap);
/* call before _all_ evaluation functions */
void curvemapping_initialize(struct CurveMapping *cumap);
-void curvemap_initialize(struct CurveMap *cuma);
/* keep these (const CurveMap) - to help with thread safety */
/* single curve, no table check */
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 063fc2eccab..7f94f365925 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -878,19 +878,6 @@ void curvemapping_initialize(CurveMapping *cumap)
}
}
-void curvemap_initialize(CurveMap *cuma)
-{
- if (cuma->table == NULL) {
- rctf clipr;
- /* clip rectangle is not available here, but we can use a temporary
- * rectangle with the same min/max values */
- clipr.xmin = cuma->mintable;
- clipr.xmax = cuma->maxtable;
-
- curvemap_make_table(cuma, &clipr);
- }
-}
-
void curvemapping_table_RGBA(const CurveMapping *cumap, float **array, int *size)
{
int a;